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

presence.js: Make get_status return active for logged in user.

Browse Source
This commit is contained in:
hackerkid
2017-04-13 07:58:15 +05:30
committed by Tim Abbott
parent ab3f55408d
commit cf15a7b561
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
frontend_tests/node_tests/activity.js
View File

@@ -2,6 +2,7 @@ global.stub_out_jquery();
set_global('page_params', {
realm_users: [],
user_id: 5,
});
set_global('feature_flags', {});
@@ -92,15 +93,22 @@ activity.update_huddles = function () {};
global.compile_template('user_presence_row');
global.compile_template('user_presence_rows');
var presence_info = {};
presence_info[alice.user_id] = { status: 'inactive' };
presence_info[fred.user_id] = { status: 'active' };
presence_info[jill.user_id] = { status: 'active' };
presence.presence_info = presence_info;
(function test_get_status() {
assert.equal(presence.get_status(page_params.user_id), "active");
assert.equal(presence.get_status(alice.user_id), "inactive");
assert.equal(presence.get_status(fred.user_id), "active");
}());
(function test_sort_users() {
var user_ids = [alice.user_id, fred.user_id, jill.user_id];
var presence_info = {};
presence_info[alice.user_id] = { status: 'inactive' };
presence_info[fred.user_id] = { status: 'active' };
presence_info[jill.user_id] = { status: 'active' };
presence.presence_info = presence_info;
activity._sort_users(user_ids);
assert.deepEqual(user_ids, [

3
static/js/presence.js
View File

@@ -33,6 +33,9 @@ exports.is_not_offline = function (user_id) {
};
exports.get_status = function (user_id) {
if (user_id === page_params.user_id) {
return "active";
}
return exports.presence_info[user_id].status;
};