paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 21:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

buddy list: Use user_ids in DOM list elements.

Browse Source
This commit is contained in:
Steve Howell
2016-11-17 14:16:29 -08:00
committed by Tim Abbott
parent 78474c8bee
commit aadfe133e2
8 changed files with 87 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
frontend_tests/node_tests/activity.js
View File

@@ -52,6 +52,8 @@ global.people.add(mark);
global.people.add(norbert);
var people = global.people;
var activity = require('js/activity.js');
activity.update_huddles = function () {};
@@ -75,10 +77,10 @@ activity.update_huddles = function () {};
(function test_process_loaded_messages() {
var huddle1 = 'bar@zulip.com,foo@zulip.com';
var huddle1 = 'jill@zulip.com,norbert@zulip.com';
var timestamp1 = 1382479029; // older
var huddle2 = 'alice@zulip.com,bob@zulip.com';
var huddle2 = 'alice@zulip.com,fred@zulip.com';
var timestamp2 = 1382479033; // newer
var old_timestamp = 1382479000;
@@ -110,44 +112,56 @@ activity.update_huddles = function () {};
activity.process_loaded_messages(messages);
assert.deepEqual(activity.get_huddles(), [huddle2, huddle1]);
var user_ids_string1 = people.emails_strings_to_user_ids_string(huddle1);
var user_ids_string2 = people.emails_strings_to_user_ids_string(huddle2);
assert.deepEqual(activity.get_huddles(), [user_ids_string2, user_ids_string1]);
}());
(function test_full_huddle_name() {
function full_name(emails_string) {
var user_ids_string = people.emails_strings_to_user_ids_string(emails_string);
return activity.full_huddle_name(user_ids_string);
}
assert.equal(
activity.full_huddle_name('alice@zulip.com,jill@zulip.com'),
full_name('alice@zulip.com,jill@zulip.com'),
'Alice Smith, Jill Hill'
);
assert.equal(
activity.full_huddle_name('alice@zulip.com,fred@zulip.com,jill@zulip.com'),
full_name('alice@zulip.com,fred@zulip.com,jill@zulip.com'),
'Alice Smith, Fred Flintstone, Jill Hill'
);
}());
(function test_short_huddle_name() {
function short_name(emails_string) {
var user_ids_string = people.emails_strings_to_user_ids_string(emails_string);
return activity.short_huddle_name(user_ids_string);
}
assert.equal(
activity.short_huddle_name('alice@zulip.com'),
short_name('alice@zulip.com'),
'Alice Smith'
);
assert.equal(
activity.short_huddle_name('alice@zulip.com,jill@zulip.com'),
short_name('alice@zulip.com,jill@zulip.com'),
'Alice Smith, Jill Hill'
);
assert.equal(
activity.short_huddle_name('alice@zulip.com,fred@zulip.com,jill@zulip.com'),
short_name('alice@zulip.com,fred@zulip.com,jill@zulip.com'),
'Alice Smith, Fred Flintstone, Jill Hill'
);
assert.equal(
activity.short_huddle_name('alice@zulip.com,fred@zulip.com,jill@zulip.com,mark@zulip.com'),
short_name('alice@zulip.com,fred@zulip.com,jill@zulip.com,mark@zulip.com'),
'Alice Smith, Fred Flintstone, Jill Hill, + 1 other'
);
assert.equal(
activity.short_huddle_name('alice@zulip.com,fred@zulip.com,jill@zulip.com,mark@zulip.com,norbert@zulip.com'),
short_name('alice@zulip.com,fred@zulip.com,jill@zulip.com,mark@zulip.com,norbert@zulip.com'),
'Alice Smith, Fred Flintstone, Jill Hill, + 2 others'
);
@@ -155,6 +169,7 @@ activity.update_huddles = function () {};
(function test_huddle_fraction_present() {
var huddle = 'alice@zulip.com,fred@zulip.com,jill@zulip.com,mark@zulip.com';
huddle = people.emails_strings_to_user_ids_string(huddle);
var presence_list = {};
presence_list[alice.user_id] = {status: 'active'};

14
frontend_tests/node_tests/presence_list_performance.js
View File

@@ -84,31 +84,31 @@ activity.presence_info[norbert.user_id] = {status: activity.ACTIVE};
var users = activity.update_users();
assert.deepEqual(users, [
{ name: 'Fred Flintstone',
email: 'fred@zulip.com',
user_id: fred.user_id,
num_unread: 0,
type: 'active',
type_desc: 'is active',
mobile: undefined },
{ name: 'Jill Hill',
email: 'jill@zulip.com',
user_id: jill.user_id,
num_unread: 0,
type: 'active',
type_desc: 'is active',
mobile: undefined },
{ name: 'Norbert Oswald',
email: 'norbert@zulip.com',
user_id: norbert.user_id,
num_unread: 0,
type: 'active',
type_desc: 'is active',
mobile: undefined },
{ name: 'Alice Smith',
email: 'alice@zulip.com',
user_id: alice.user_id,
num_unread: 0,
type: 'idle',
type_desc: 'is not active',
mobile: undefined },
{ name: 'Marky Mark',
email: 'mark@zulip.com',
user_id: mark.user_id,
num_unread: 0,
type: 'idle',
type_desc: 'is not active',
@@ -126,7 +126,7 @@ activity.presence_info[norbert.user_id] = {status: activity.ACTIVE};
users = activity.update_users(users);
assert.deepEqual(users, [
{ name: 'Alice Smith',
email: 'alice@zulip.com',
user_id: alice.user_id,
num_unread: 0,
type: 'active',
type_desc: 'is active',
@@ -143,7 +143,7 @@ activity.presence_info[norbert.user_id] = {status: activity.ACTIVE};
users = activity.update_users(users);
assert.deepEqual(users, [
{ name: 'Marky Mark',
email: 'mark@zulip.com',
user_id: mark.user_id,
num_unread: 0,
type: 'active',
type_desc: 'is active',