2017-06-02 00:33:39 +02:00
|
|
|
set_global('$', global.make_zjquery());
|
|
|
|
|
|
|
|
set_global('templates', {});
|
2014-01-16 21:38:40 +01:00
|
|
|
|
2017-08-09 18:55:37 +02:00
|
|
|
zrequire('unread_ui');
|
|
|
|
zrequire('Filter', 'js/filter');
|
|
|
|
zrequire('util');
|
|
|
|
zrequire('topic_data');
|
|
|
|
zrequire('stream_sort');
|
|
|
|
zrequire('colorspace');
|
|
|
|
zrequire('stream_color');
|
|
|
|
zrequire('hash_util');
|
|
|
|
zrequire('narrow');
|
|
|
|
zrequire('unread');
|
|
|
|
zrequire('stream_data');
|
|
|
|
zrequire('stream_list');
|
2013-11-26 16:39:58 +01:00
|
|
|
|
2017-06-14 14:33:04 +02:00
|
|
|
var noop = function () {};
|
|
|
|
var return_false = function () { return false; };
|
2017-06-14 16:06:21 +02:00
|
|
|
var return_true = function () { return true; };
|
2017-06-14 14:33:04 +02:00
|
|
|
|
2017-06-14 20:17:09 +02:00
|
|
|
set_global('topic_list', {});
|
2018-02-12 22:56:37 +01:00
|
|
|
set_global('overlays', {});
|
2017-06-14 20:17:09 +02:00
|
|
|
|
2016-10-17 20:02:32 +02:00
|
|
|
(function test_create_sidebar_row() {
|
|
|
|
// Make a couple calls to create_sidebar_row() and make sure they
|
2014-01-16 21:38:40 +01:00
|
|
|
// generate the right markup as well as play nice with get_stream_li().
|
|
|
|
|
2016-10-17 20:02:32 +02:00
|
|
|
var devel = {
|
2014-01-16 21:38:40 +01:00
|
|
|
name: 'devel',
|
2016-11-11 14:20:19 +01:00
|
|
|
stream_id: 100,
|
2014-01-16 21:38:40 +01:00
|
|
|
color: 'blue',
|
2016-11-11 02:39:22 +01:00
|
|
|
subscribed: true,
|
2017-11-13 17:17:34 +01:00
|
|
|
pin_to_top: true,
|
2014-01-16 21:38:40 +01:00
|
|
|
};
|
2016-10-17 20:02:32 +02:00
|
|
|
global.stream_data.add_sub('devel', devel);
|
2014-01-16 21:38:40 +01:00
|
|
|
|
2016-10-17 20:02:32 +02:00
|
|
|
var social = {
|
2014-01-16 21:38:40 +01:00
|
|
|
name: 'social',
|
2016-11-11 14:20:19 +01:00
|
|
|
stream_id: 200,
|
2014-01-16 21:38:40 +01:00
|
|
|
color: 'green',
|
2016-11-11 02:39:22 +01:00
|
|
|
subscribed: true,
|
2014-01-16 21:38:40 +01:00
|
|
|
};
|
2016-10-17 20:02:32 +02:00
|
|
|
global.stream_data.add_sub('social', social);
|
2014-01-16 21:38:40 +01:00
|
|
|
|
2017-01-15 17:09:16 +01:00
|
|
|
global.unread.num_unread_for_stream = function () {
|
|
|
|
return 42;
|
|
|
|
};
|
|
|
|
|
2017-06-02 00:33:39 +02:00
|
|
|
(function create_devel_sidebar_row() {
|
2017-07-08 15:16:19 +02:00
|
|
|
var devel_value = $.create('devel-value');
|
|
|
|
var devel_count = $.create('devel-count');
|
|
|
|
|
|
|
|
var sidebar_row = $('<devel sidebar row>');
|
|
|
|
|
|
|
|
sidebar_row.set_find_results('.count', devel_count);
|
|
|
|
devel_count.set_find_results('.value', devel_value);
|
|
|
|
devel_count.set_parent(sidebar_row);
|
2017-06-02 00:33:39 +02:00
|
|
|
|
|
|
|
global.templates.render = function (template_name, data) {
|
|
|
|
assert.equal(template_name, 'stream_sidebar_row');
|
2018-02-15 21:02:47 +01:00
|
|
|
assert.equal(data.uri, '#narrow/stream/100-devel');
|
2017-07-08 15:16:19 +02:00
|
|
|
return '<devel sidebar row>';
|
2017-06-02 00:33:39 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
stream_list.create_sidebar_row(devel);
|
|
|
|
assert.equal(devel_value.text(), '42');
|
|
|
|
}());
|
|
|
|
|
|
|
|
(function create_social_sidebar_row() {
|
2017-07-08 15:16:19 +02:00
|
|
|
var social_value = $.create('social-value');
|
|
|
|
var social_count = $.create('social-count');
|
|
|
|
var sidebar_row = $('<social sidebar row>');
|
|
|
|
|
|
|
|
sidebar_row.set_find_results('.count', social_count);
|
|
|
|
social_count.set_find_results('.value', social_value);
|
|
|
|
social_count.set_parent(sidebar_row);
|
2017-06-02 00:33:39 +02:00
|
|
|
|
|
|
|
global.templates.render = function (template_name, data) {
|
|
|
|
assert.equal(template_name, 'stream_sidebar_row');
|
2018-02-15 21:02:47 +01:00
|
|
|
assert.equal(data.uri, '#narrow/stream/200-social');
|
2017-07-08 15:16:19 +02:00
|
|
|
return '<social sidebar row>';
|
2017-06-02 00:33:39 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
stream_list.create_sidebar_row(social);
|
|
|
|
assert.equal(social_value.text(), '42');
|
|
|
|
}());
|
|
|
|
|
2017-07-18 13:30:14 +02:00
|
|
|
var split = '<hr class="stream-split">';
|
|
|
|
var devel_sidebar = $('<devel sidebar row>');
|
|
|
|
var social_sidebar = $('<social sidebar row>');
|
2017-06-02 00:33:39 +02:00
|
|
|
|
|
|
|
var appended_elems;
|
|
|
|
$('#stream_filters').append = function (elems) {
|
|
|
|
appended_elems = elems;
|
|
|
|
};
|
2014-01-16 21:38:40 +01:00
|
|
|
|
2017-06-02 00:33:39 +02:00
|
|
|
stream_list.build_stream_list();
|
2016-11-11 02:39:22 +01:00
|
|
|
|
2017-06-02 00:33:39 +02:00
|
|
|
var expected_elems = [
|
2017-11-13 17:17:34 +01:00
|
|
|
devel_sidebar, //pinned
|
|
|
|
split, //separator
|
|
|
|
social_sidebar, //not pinned
|
2017-06-02 00:33:39 +02:00
|
|
|
];
|
2014-01-17 18:23:39 +01:00
|
|
|
|
2017-06-02 00:33:39 +02:00
|
|
|
assert.deepEqual(appended_elems, expected_elems);
|
2014-01-17 18:23:39 +01:00
|
|
|
|
2017-07-08 15:16:19 +02:00
|
|
|
var social_li = $('<social sidebar row>');
|
2017-06-14 16:06:21 +02:00
|
|
|
var stream_id = social.stream_id;
|
|
|
|
|
2017-07-08 15:16:19 +02:00
|
|
|
var privacy_elem = $.create('privacy-stub');
|
2017-07-08 14:31:18 +02:00
|
|
|
social_li.set_find_results('.stream-privacy', privacy_elem);
|
2017-06-14 16:33:30 +02:00
|
|
|
|
|
|
|
social.invite_only = true;
|
|
|
|
social.color = '#222222';
|
|
|
|
global.templates.render = function (template_name, data) {
|
|
|
|
assert.equal(template_name, 'stream_privacy');
|
|
|
|
assert.equal(data.invite_only, true);
|
|
|
|
assert.equal(data.dark_background, 'dark_background');
|
|
|
|
return '<div>privacy-html';
|
|
|
|
};
|
|
|
|
stream_list.redraw_stream_privacy(social);
|
|
|
|
assert.equal(privacy_elem.html(), '<div>privacy-html');
|
|
|
|
|
2017-06-14 16:06:21 +02:00
|
|
|
stream_list.set_in_home_view(stream_id, false);
|
|
|
|
assert(social_li.hasClass('out_of_home_view'));
|
|
|
|
|
|
|
|
stream_list.set_in_home_view(stream_id, true);
|
|
|
|
assert(!social_li.hasClass('out_of_home_view'));
|
|
|
|
|
|
|
|
var row = stream_list.stream_sidebar.get_row(stream_id);
|
|
|
|
stream_data.is_active = return_true;
|
|
|
|
row.update_whether_active();
|
|
|
|
assert(!social_li.hasClass('inactive_stream'));
|
|
|
|
|
|
|
|
stream_data.is_active = return_false;
|
|
|
|
row.update_whether_active();
|
|
|
|
assert(social_li.hasClass('inactive_stream'));
|
|
|
|
|
|
|
|
var removed;
|
|
|
|
social_li.remove = function () {
|
|
|
|
removed = true;
|
|
|
|
};
|
|
|
|
|
|
|
|
row.remove();
|
|
|
|
assert(removed);
|
2014-01-16 21:38:40 +01:00
|
|
|
}());
|
2017-11-13 17:17:34 +01:00
|
|
|
function add_row(sub) {
|
|
|
|
global.stream_data.add_sub(sub.name, sub);
|
|
|
|
var row = {
|
|
|
|
update_whether_active: function () {},
|
|
|
|
get_li: function () {
|
|
|
|
var html = '<' + sub.name + ' sidebar row html>';
|
|
|
|
var obj = $(html);
|
|
|
|
|
|
|
|
obj.length = 1; // bypass blueslip error
|
|
|
|
|
|
|
|
return obj;
|
|
|
|
},
|
|
|
|
};
|
|
|
|
stream_list.stream_sidebar.set_row(sub.stream_id, row);
|
|
|
|
}
|
2017-06-14 14:33:04 +02:00
|
|
|
function initialize_stream_data() {
|
2017-04-28 15:37:52 +02:00
|
|
|
stream_data.clear_subscriptions();
|
|
|
|
|
left-sidebar: Sort pinned streams by lowercase stream name.
The pinned streams were sorted in alphabetic order (i.e. Verona appears
before devel). The reason is that after we plucked pinned streams out from
stream_data.subscribed_streams(), we didn't sort them again, so they
remained in the alphabetic order used in stream_data.
However, we did sort unpinned streams explicitly by using custom compare
function in stream_list.js (by default sort by lowercase stream name,
but when there are more than 40 subscribed streams, sort active streams
first). That's why this issue only relates to pinned streams.
Changes were made to sort pinned streams by lowercase stream name, always,
whether they are active or not (different from unpinned streams).
Tests were added to ensure this overall sort order is correct, i.e.
1. pinned streams are always sorted by lowercase stream name.
2. pinned streams are always before unpinned streams.
3. unpinned streams are sorted by lowercase stream name, if there are more
than 40 subscribed streams, sort active streams at the top, among active
and inactive streams, still sorted by lowercase stream name.
Fixes #3701
2017-02-19 15:24:27 +01:00
|
|
|
// pinned streams
|
2016-07-01 07:26:09 +02:00
|
|
|
var develSub = {
|
|
|
|
name: 'devel',
|
|
|
|
stream_id: 1000,
|
|
|
|
color: 'blue',
|
left-sidebar: Sort pinned streams by lowercase stream name.
The pinned streams were sorted in alphabetic order (i.e. Verona appears
before devel). The reason is that after we plucked pinned streams out from
stream_data.subscribed_streams(), we didn't sort them again, so they
remained in the alphabetic order used in stream_data.
However, we did sort unpinned streams explicitly by using custom compare
function in stream_list.js (by default sort by lowercase stream name,
but when there are more than 40 subscribed streams, sort active streams
first). That's why this issue only relates to pinned streams.
Changes were made to sort pinned streams by lowercase stream name, always,
whether they are active or not (different from unpinned streams).
Tests were added to ensure this overall sort order is correct, i.e.
1. pinned streams are always sorted by lowercase stream name.
2. pinned streams are always before unpinned streams.
3. unpinned streams are sorted by lowercase stream name, if there are more
than 40 subscribed streams, sort active streams at the top, among active
and inactive streams, still sorted by lowercase stream name.
Fixes #3701
2017-02-19 15:24:27 +01:00
|
|
|
pin_to_top: true,
|
2016-12-03 23:17:57 +01:00
|
|
|
subscribed: true,
|
2016-07-01 07:26:09 +02:00
|
|
|
};
|
2017-06-02 00:33:39 +02:00
|
|
|
add_row(develSub);
|
2016-07-01 07:26:09 +02:00
|
|
|
|
left-sidebar: Sort pinned streams by lowercase stream name.
The pinned streams were sorted in alphabetic order (i.e. Verona appears
before devel). The reason is that after we plucked pinned streams out from
stream_data.subscribed_streams(), we didn't sort them again, so they
remained in the alphabetic order used in stream_data.
However, we did sort unpinned streams explicitly by using custom compare
function in stream_list.js (by default sort by lowercase stream name,
but when there are more than 40 subscribed streams, sort active streams
first). That's why this issue only relates to pinned streams.
Changes were made to sort pinned streams by lowercase stream name, always,
whether they are active or not (different from unpinned streams).
Tests were added to ensure this overall sort order is correct, i.e.
1. pinned streams are always sorted by lowercase stream name.
2. pinned streams are always before unpinned streams.
3. unpinned streams are sorted by lowercase stream name, if there are more
than 40 subscribed streams, sort active streams at the top, among active
and inactive streams, still sorted by lowercase stream name.
Fixes #3701
2017-02-19 15:24:27 +01:00
|
|
|
var RomeSub = {
|
|
|
|
name: 'Rome',
|
2016-07-01 07:26:09 +02:00
|
|
|
stream_id: 2000,
|
left-sidebar: Sort pinned streams by lowercase stream name.
The pinned streams were sorted in alphabetic order (i.e. Verona appears
before devel). The reason is that after we plucked pinned streams out from
stream_data.subscribed_streams(), we didn't sort them again, so they
remained in the alphabetic order used in stream_data.
However, we did sort unpinned streams explicitly by using custom compare
function in stream_list.js (by default sort by lowercase stream name,
but when there are more than 40 subscribed streams, sort active streams
first). That's why this issue only relates to pinned streams.
Changes were made to sort pinned streams by lowercase stream name, always,
whether they are active or not (different from unpinned streams).
Tests were added to ensure this overall sort order is correct, i.e.
1. pinned streams are always sorted by lowercase stream name.
2. pinned streams are always before unpinned streams.
3. unpinned streams are sorted by lowercase stream name, if there are more
than 40 subscribed streams, sort active streams at the top, among active
and inactive streams, still sorted by lowercase stream name.
Fixes #3701
2017-02-19 15:24:27 +01:00
|
|
|
color: 'blue',
|
2016-07-01 07:26:09 +02:00
|
|
|
pin_to_top: true,
|
2016-12-03 23:17:57 +01:00
|
|
|
subscribed: true,
|
2016-07-01 07:26:09 +02:00
|
|
|
};
|
2017-06-02 00:33:39 +02:00
|
|
|
add_row(RomeSub);
|
left-sidebar: Sort pinned streams by lowercase stream name.
The pinned streams were sorted in alphabetic order (i.e. Verona appears
before devel). The reason is that after we plucked pinned streams out from
stream_data.subscribed_streams(), we didn't sort them again, so they
remained in the alphabetic order used in stream_data.
However, we did sort unpinned streams explicitly by using custom compare
function in stream_list.js (by default sort by lowercase stream name,
but when there are more than 40 subscribed streams, sort active streams
first). That's why this issue only relates to pinned streams.
Changes were made to sort pinned streams by lowercase stream name, always,
whether they are active or not (different from unpinned streams).
Tests were added to ensure this overall sort order is correct, i.e.
1. pinned streams are always sorted by lowercase stream name.
2. pinned streams are always before unpinned streams.
3. unpinned streams are sorted by lowercase stream name, if there are more
than 40 subscribed streams, sort active streams at the top, among active
and inactive streams, still sorted by lowercase stream name.
Fixes #3701
2017-02-19 15:24:27 +01:00
|
|
|
|
|
|
|
var testSub = {
|
|
|
|
name: 'test',
|
|
|
|
stream_id: 3000,
|
|
|
|
color: 'blue',
|
|
|
|
pin_to_top: true,
|
|
|
|
subscribed: true,
|
|
|
|
};
|
2017-06-02 00:33:39 +02:00
|
|
|
add_row(testSub);
|
left-sidebar: Sort pinned streams by lowercase stream name.
The pinned streams were sorted in alphabetic order (i.e. Verona appears
before devel). The reason is that after we plucked pinned streams out from
stream_data.subscribed_streams(), we didn't sort them again, so they
remained in the alphabetic order used in stream_data.
However, we did sort unpinned streams explicitly by using custom compare
function in stream_list.js (by default sort by lowercase stream name,
but when there are more than 40 subscribed streams, sort active streams
first). That's why this issue only relates to pinned streams.
Changes were made to sort pinned streams by lowercase stream name, always,
whether they are active or not (different from unpinned streams).
Tests were added to ensure this overall sort order is correct, i.e.
1. pinned streams are always sorted by lowercase stream name.
2. pinned streams are always before unpinned streams.
3. unpinned streams are sorted by lowercase stream name, if there are more
than 40 subscribed streams, sort active streams at the top, among active
and inactive streams, still sorted by lowercase stream name.
Fixes #3701
2017-02-19 15:24:27 +01:00
|
|
|
|
|
|
|
// unpinned streams
|
|
|
|
var announceSub = {
|
|
|
|
name: 'announce',
|
|
|
|
stream_id: 4000,
|
|
|
|
color: 'green',
|
|
|
|
pin_to_top: false,
|
|
|
|
subscribed: true,
|
|
|
|
};
|
2017-06-02 00:33:39 +02:00
|
|
|
add_row(announceSub);
|
left-sidebar: Sort pinned streams by lowercase stream name.
The pinned streams were sorted in alphabetic order (i.e. Verona appears
before devel). The reason is that after we plucked pinned streams out from
stream_data.subscribed_streams(), we didn't sort them again, so they
remained in the alphabetic order used in stream_data.
However, we did sort unpinned streams explicitly by using custom compare
function in stream_list.js (by default sort by lowercase stream name,
but when there are more than 40 subscribed streams, sort active streams
first). That's why this issue only relates to pinned streams.
Changes were made to sort pinned streams by lowercase stream name, always,
whether they are active or not (different from unpinned streams).
Tests were added to ensure this overall sort order is correct, i.e.
1. pinned streams are always sorted by lowercase stream name.
2. pinned streams are always before unpinned streams.
3. unpinned streams are sorted by lowercase stream name, if there are more
than 40 subscribed streams, sort active streams at the top, among active
and inactive streams, still sorted by lowercase stream name.
Fixes #3701
2017-02-19 15:24:27 +01:00
|
|
|
|
|
|
|
var DenmarkSub = {
|
|
|
|
name: 'Denmark',
|
|
|
|
stream_id: 5000,
|
|
|
|
color: 'green',
|
|
|
|
pin_to_top: false,
|
|
|
|
subscribed: true,
|
|
|
|
};
|
2017-06-02 00:33:39 +02:00
|
|
|
add_row(DenmarkSub);
|
left-sidebar: Sort pinned streams by lowercase stream name.
The pinned streams were sorted in alphabetic order (i.e. Verona appears
before devel). The reason is that after we plucked pinned streams out from
stream_data.subscribed_streams(), we didn't sort them again, so they
remained in the alphabetic order used in stream_data.
However, we did sort unpinned streams explicitly by using custom compare
function in stream_list.js (by default sort by lowercase stream name,
but when there are more than 40 subscribed streams, sort active streams
first). That's why this issue only relates to pinned streams.
Changes were made to sort pinned streams by lowercase stream name, always,
whether they are active or not (different from unpinned streams).
Tests were added to ensure this overall sort order is correct, i.e.
1. pinned streams are always sorted by lowercase stream name.
2. pinned streams are always before unpinned streams.
3. unpinned streams are sorted by lowercase stream name, if there are more
than 40 subscribed streams, sort active streams at the top, among active
and inactive streams, still sorted by lowercase stream name.
Fixes #3701
2017-02-19 15:24:27 +01:00
|
|
|
|
2017-04-28 15:37:52 +02:00
|
|
|
var carSub = {
|
|
|
|
name: 'cars',
|
left-sidebar: Sort pinned streams by lowercase stream name.
The pinned streams were sorted in alphabetic order (i.e. Verona appears
before devel). The reason is that after we plucked pinned streams out from
stream_data.subscribed_streams(), we didn't sort them again, so they
remained in the alphabetic order used in stream_data.
However, we did sort unpinned streams explicitly by using custom compare
function in stream_list.js (by default sort by lowercase stream name,
but when there are more than 40 subscribed streams, sort active streams
first). That's why this issue only relates to pinned streams.
Changes were made to sort pinned streams by lowercase stream name, always,
whether they are active or not (different from unpinned streams).
Tests were added to ensure this overall sort order is correct, i.e.
1. pinned streams are always sorted by lowercase stream name.
2. pinned streams are always before unpinned streams.
3. unpinned streams are sorted by lowercase stream name, if there are more
than 40 subscribed streams, sort active streams at the top, among active
and inactive streams, still sorted by lowercase stream name.
Fixes #3701
2017-02-19 15:24:27 +01:00
|
|
|
stream_id: 6000,
|
|
|
|
color: 'green',
|
|
|
|
pin_to_top: false,
|
|
|
|
subscribed: true,
|
|
|
|
};
|
2017-06-02 00:33:39 +02:00
|
|
|
add_row(carSub);
|
2017-06-14 14:33:04 +02:00
|
|
|
}
|
left-sidebar: Sort pinned streams by lowercase stream name.
The pinned streams were sorted in alphabetic order (i.e. Verona appears
before devel). The reason is that after we plucked pinned streams out from
stream_data.subscribed_streams(), we didn't sort them again, so they
remained in the alphabetic order used in stream_data.
However, we did sort unpinned streams explicitly by using custom compare
function in stream_list.js (by default sort by lowercase stream name,
but when there are more than 40 subscribed streams, sort active streams
first). That's why this issue only relates to pinned streams.
Changes were made to sort pinned streams by lowercase stream name, always,
whether they are active or not (different from unpinned streams).
Tests were added to ensure this overall sort order is correct, i.e.
1. pinned streams are always sorted by lowercase stream name.
2. pinned streams are always before unpinned streams.
3. unpinned streams are sorted by lowercase stream name, if there are more
than 40 subscribed streams, sort active streams at the top, among active
and inactive streams, still sorted by lowercase stream name.
Fixes #3701
2017-02-19 15:24:27 +01:00
|
|
|
|
2017-06-14 20:17:09 +02:00
|
|
|
(function test_narrowing() {
|
|
|
|
initialize_stream_data();
|
|
|
|
|
|
|
|
var document = 'document-stub';
|
|
|
|
|
|
|
|
set_global('document', document);
|
|
|
|
set_global('narrow_state', {
|
|
|
|
stream: function () { return 'devel'; },
|
|
|
|
topic: noop,
|
|
|
|
});
|
|
|
|
|
|
|
|
topic_list.set_click_handlers = noop;
|
2017-08-11 00:30:23 +02:00
|
|
|
topic_list.close = noop;
|
2017-06-14 20:17:09 +02:00
|
|
|
topic_list.remove_expanded_topics = noop;
|
|
|
|
topic_list.rebuild = noop;
|
2017-08-11 00:30:23 +02:00
|
|
|
topic_list.active_stream_id = noop;
|
|
|
|
stream_list.show_all_streams = noop;
|
2017-06-14 20:17:09 +02:00
|
|
|
stream_list.scroll_element_into_container = noop;
|
|
|
|
|
2017-07-01 22:30:50 +02:00
|
|
|
var scrollbar_updated = false;
|
|
|
|
$.stub_selector("#stream-filters-container", {
|
|
|
|
perfectScrollbar: function () { scrollbar_updated = true; },
|
|
|
|
});
|
|
|
|
|
2017-07-08 15:16:19 +02:00
|
|
|
assert(!$('<devel sidebar row html>').hasClass('active-filter'));
|
2017-06-14 20:17:09 +02:00
|
|
|
|
|
|
|
stream_list.initialize();
|
|
|
|
|
|
|
|
var filter;
|
|
|
|
|
|
|
|
filter = new Filter([
|
|
|
|
{operator: 'stream', operand: 'devel'},
|
|
|
|
]);
|
2017-08-12 16:49:10 +02:00
|
|
|
stream_list.handle_narrow_activated(filter);
|
2017-07-08 15:16:19 +02:00
|
|
|
assert($('<devel sidebar row html>').hasClass('active-filter'));
|
2017-07-01 22:30:50 +02:00
|
|
|
assert(scrollbar_updated); // Make sure we are updating perfectScrollbar.
|
2017-06-14 20:17:09 +02:00
|
|
|
|
2017-07-01 22:30:50 +02:00
|
|
|
scrollbar_updated = false;
|
2017-06-14 20:17:09 +02:00
|
|
|
filter = new Filter([
|
|
|
|
{operator: 'stream', operand: 'cars'},
|
|
|
|
{operator: 'topic', operand: 'sedans'},
|
|
|
|
]);
|
2017-08-12 16:49:10 +02:00
|
|
|
stream_list.handle_narrow_activated(filter);
|
2017-06-14 20:17:09 +02:00
|
|
|
assert(!$("ul.filters li").hasClass('active-filter'));
|
2017-07-08 15:16:19 +02:00
|
|
|
assert(!$('<cars sidebar row html>').hasClass('active-filter')); // false because of topic
|
2017-07-01 22:30:50 +02:00
|
|
|
assert(scrollbar_updated); // Make sure we are updating perfectScrollbar.
|
2017-06-14 20:17:09 +02:00
|
|
|
|
|
|
|
filter = new Filter([
|
|
|
|
{operator: 'stream', operand: 'cars'},
|
|
|
|
]);
|
2017-08-12 16:49:10 +02:00
|
|
|
stream_list.handle_narrow_activated(filter);
|
2017-06-14 20:17:09 +02:00
|
|
|
assert(!$("ul.filters li").hasClass('active-filter'));
|
2017-07-08 15:16:19 +02:00
|
|
|
assert($('<cars sidebar row html>').hasClass('active-filter'));
|
2017-06-14 20:17:09 +02:00
|
|
|
}());
|
|
|
|
|
2018-02-12 22:56:37 +01:00
|
|
|
var keydown_handler = $('.stream-list-filter').get_on_handler('keydown');
|
|
|
|
|
|
|
|
(function test_arrow_navigation() {
|
|
|
|
|
|
|
|
stream_list.build_stream_list();
|
|
|
|
initialize_stream_data();
|
|
|
|
|
|
|
|
var stream_order = ['devel', 'Rome', 'test',
|
|
|
|
'-divider-', 'announce','Denmark',
|
|
|
|
'-divider-','cars'];
|
|
|
|
var stream_count = 8;
|
|
|
|
|
|
|
|
// Mock the jquery is func
|
|
|
|
$('.stream-list-filter').is = function (sel) {
|
|
|
|
if (sel === ':focus') {
|
|
|
|
return $('.stream-list-filter').is_focused();
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
// Mock the jquery first func
|
|
|
|
$('#stream_filters li.narrow-filter').first = function () {
|
|
|
|
return $('#stream_filters li[data-stream-name="' + stream_order[0] + '"]');
|
|
|
|
};
|
|
|
|
$('#stream_filters li.narrow-filter').last = function () {
|
|
|
|
return $('#stream_filters li[data-stream-name="' + stream_order[stream_count - 1] + '"]');
|
|
|
|
};
|
|
|
|
|
|
|
|
var sel_index = 0;
|
|
|
|
// Returns which element is highlighted
|
|
|
|
$('#stream_filters li.narrow-filter.highlighted_stream')
|
|
|
|
.expectOne().data = function () {
|
|
|
|
// Return random id (is further not used)
|
|
|
|
return 1;
|
|
|
|
};
|
|
|
|
|
|
|
|
// Returns element before highlighted one
|
|
|
|
$('#stream_filters li.narrow-filter.highlighted_stream')
|
|
|
|
.expectOne().prev = function () {
|
|
|
|
if (sel_index === 0) {
|
|
|
|
// Top, no prev element
|
|
|
|
return $('div.no_stream');
|
|
|
|
} else if (sel_index === 3 || sel_index === 6) {
|
|
|
|
return $('div.divider');
|
|
|
|
}
|
|
|
|
return $('#stream_filters li[data-stream-name="'
|
|
|
|
+ stream_order[sel_index-1] + '"]');
|
|
|
|
};
|
|
|
|
|
|
|
|
// Returns element after highlighted one
|
|
|
|
$('#stream_filters li.narrow-filter.highlighted_stream')
|
|
|
|
.expectOne().next = function () {
|
|
|
|
if (sel_index === stream_count - 1) {
|
|
|
|
// Bottom, no next element
|
|
|
|
return $('div.no_stream');
|
|
|
|
} else if (sel_index === 3 || sel_index === 6) {
|
|
|
|
return $('div.divider');
|
|
|
|
}
|
|
|
|
return $('#stream_filters li[data-stream-name="'
|
|
|
|
+ stream_order[sel_index + 1] + '"]');
|
|
|
|
};
|
|
|
|
|
|
|
|
for (var i = 0; i < stream_count; i = i + 1) {
|
|
|
|
if (i === 3 || i === 6) {
|
|
|
|
$('#stream_filters li[data-stream-name="' + stream_order[i] + '"]')
|
|
|
|
.is = return_false;
|
|
|
|
} else {
|
|
|
|
$('#stream_filters li[data-stream-name="' + stream_order[i] + '"]')
|
|
|
|
.is = return_true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
$('div.no_stream').is = return_false;
|
|
|
|
$('div.divider').is = return_false;
|
|
|
|
|
|
|
|
$('#stream_filters li.narrow-filter').length = stream_count;
|
|
|
|
|
|
|
|
// up
|
|
|
|
var e = {
|
|
|
|
keyCode: 38,
|
|
|
|
stopPropagation: function () {},
|
|
|
|
preventDefault: function () {},
|
|
|
|
};
|
|
|
|
|
|
|
|
keydown_handler(e);
|
|
|
|
// Now the last element is highlighted
|
|
|
|
sel_index = stream_count - 1;
|
|
|
|
keydown_handler(e);
|
|
|
|
sel_index = sel_index - 1;
|
|
|
|
|
|
|
|
// down
|
|
|
|
e = {
|
|
|
|
keyCode: 40,
|
|
|
|
stopPropagation: function () {},
|
|
|
|
preventDefault: function () {},
|
|
|
|
};
|
|
|
|
keydown_handler(e);
|
|
|
|
sel_index = sel_index + 1;
|
|
|
|
keydown_handler(e);
|
|
|
|
}());
|
|
|
|
|
|
|
|
(function test_enter_press() {
|
|
|
|
var e = {
|
|
|
|
keyCode: 13,
|
|
|
|
stopPropagation: function () {},
|
|
|
|
preventDefault: function () {},
|
|
|
|
};
|
|
|
|
|
|
|
|
overlays.is_active = return_false;
|
|
|
|
narrow_state.active = return_false;
|
|
|
|
stream_data.get_sub_by_id = function () {
|
|
|
|
return 'name';
|
|
|
|
};
|
|
|
|
narrow.by = noop;
|
|
|
|
stream_list.clear_and_hide_search = noop;
|
|
|
|
|
|
|
|
// Enter text and narrow users
|
|
|
|
$(".stream-list-filter").expectOne().val('');
|
|
|
|
|
|
|
|
keydown_handler(e);
|
|
|
|
}());
|
|
|
|
|
|
|
|
(function test_focusout_user_filter() {
|
|
|
|
var e = { };
|
|
|
|
var click_handler = $('.stream-list-filter').get_on_handler('focusout');
|
|
|
|
click_handler(e);
|
|
|
|
}());
|
|
|
|
|
|
|
|
(function test_focus_user_filter() {
|
|
|
|
var e = {
|
|
|
|
stopPropagation: function () {},
|
|
|
|
};
|
|
|
|
var click_handler = $('.stream-list-filter').get_on_handler('click');
|
|
|
|
click_handler(e);
|
|
|
|
}());
|
|
|
|
|
2017-06-14 14:33:04 +02:00
|
|
|
(function test_sort_streams() {
|
|
|
|
stream_data.clear_subscriptions();
|
|
|
|
|
|
|
|
// Get coverage on early-exit.
|
|
|
|
stream_list.build_stream_list();
|
|
|
|
|
|
|
|
initialize_stream_data();
|
left-sidebar: Sort pinned streams by lowercase stream name.
The pinned streams were sorted in alphabetic order (i.e. Verona appears
before devel). The reason is that after we plucked pinned streams out from
stream_data.subscribed_streams(), we didn't sort them again, so they
remained in the alphabetic order used in stream_data.
However, we did sort unpinned streams explicitly by using custom compare
function in stream_list.js (by default sort by lowercase stream name,
but when there are more than 40 subscribed streams, sort active streams
first). That's why this issue only relates to pinned streams.
Changes were made to sort pinned streams by lowercase stream name, always,
whether they are active or not (different from unpinned streams).
Tests were added to ensure this overall sort order is correct, i.e.
1. pinned streams are always sorted by lowercase stream name.
2. pinned streams are always before unpinned streams.
3. unpinned streams are sorted by lowercase stream name, if there are more
than 40 subscribed streams, sort active streams at the top, among active
and inactive streams, still sorted by lowercase stream name.
Fixes #3701
2017-02-19 15:24:27 +01:00
|
|
|
|
2017-04-28 15:38:02 +02:00
|
|
|
global.stream_data.is_active = function (sub) {
|
|
|
|
return sub.name !== 'cars';
|
2017-04-18 19:59:35 +02:00
|
|
|
};
|
left-sidebar: Sort pinned streams by lowercase stream name.
The pinned streams were sorted in alphabetic order (i.e. Verona appears
before devel). The reason is that after we plucked pinned streams out from
stream_data.subscribed_streams(), we didn't sort them again, so they
remained in the alphabetic order used in stream_data.
However, we did sort unpinned streams explicitly by using custom compare
function in stream_list.js (by default sort by lowercase stream name,
but when there are more than 40 subscribed streams, sort active streams
first). That's why this issue only relates to pinned streams.
Changes were made to sort pinned streams by lowercase stream name, always,
whether they are active or not (different from unpinned streams).
Tests were added to ensure this overall sort order is correct, i.e.
1. pinned streams are always sorted by lowercase stream name.
2. pinned streams are always before unpinned streams.
3. unpinned streams are sorted by lowercase stream name, if there are more
than 40 subscribed streams, sort active streams at the top, among active
and inactive streams, still sorted by lowercase stream name.
Fixes #3701
2017-02-19 15:24:27 +01:00
|
|
|
|
2017-06-02 00:33:39 +02:00
|
|
|
|
|
|
|
var appended_elems;
|
|
|
|
$('#stream_filters').append = function (elems) {
|
|
|
|
appended_elems = elems;
|
|
|
|
};
|
|
|
|
|
2017-04-28 15:37:52 +02:00
|
|
|
stream_list.build_stream_list();
|
|
|
|
|
2017-07-18 13:30:14 +02:00
|
|
|
var split = '<hr class="stream-split">';
|
2017-06-02 00:33:39 +02:00
|
|
|
var expected_elems = [
|
2017-07-18 13:30:14 +02:00
|
|
|
$('<devel sidebar row html>'),
|
|
|
|
$('<Rome sidebar row html>'),
|
|
|
|
$('<test sidebar row html>'),
|
|
|
|
split,
|
|
|
|
$('<announce sidebar row html>'),
|
|
|
|
$('<Denmark sidebar row html>'),
|
|
|
|
split,
|
|
|
|
$('<cars sidebar row html>'),
|
2017-06-02 00:33:39 +02:00
|
|
|
];
|
2017-07-18 13:30:14 +02:00
|
|
|
|
2017-06-02 00:33:39 +02:00
|
|
|
assert.deepEqual(appended_elems, expected_elems);
|
|
|
|
|
|
|
|
var streams = global.stream_sort.get_streams();
|
2017-04-18 17:08:59 +02:00
|
|
|
|
|
|
|
assert.deepEqual(streams, [
|
2017-04-18 19:59:35 +02:00
|
|
|
// three groups: pinned, normal, dormant
|
2017-04-18 17:08:59 +02:00
|
|
|
'devel',
|
|
|
|
'Rome',
|
|
|
|
'test',
|
2017-04-18 19:59:35 +02:00
|
|
|
//
|
|
|
|
'announce',
|
2017-04-18 17:08:59 +02:00
|
|
|
'Denmark',
|
2017-04-18 19:59:35 +02:00
|
|
|
//
|
2017-04-28 15:37:52 +02:00
|
|
|
'cars',
|
2017-04-18 17:08:59 +02:00
|
|
|
]);
|
|
|
|
|
2017-06-14 14:33:04 +02:00
|
|
|
var denmark_sub = stream_data.get_sub('Denmark');
|
|
|
|
var stream_id = denmark_sub.stream_id;
|
|
|
|
assert(stream_list.stream_sidebar.has_row_for(stream_id));
|
|
|
|
stream_list.remove_sidebar_row(stream_id);
|
|
|
|
assert(!stream_list.stream_sidebar.has_row_for(stream_id));
|
2016-07-01 07:26:09 +02:00
|
|
|
}());
|
2017-06-14 00:27:06 +02:00
|
|
|
|
2017-11-13 17:17:34 +01:00
|
|
|
(function test_separators_only_pinned_and_dormant() {
|
|
|
|
|
|
|
|
// Test only pinned and dormant streams
|
|
|
|
|
|
|
|
stream_data.clear_subscriptions();
|
|
|
|
|
|
|
|
// Get coverage on early-exit.
|
|
|
|
stream_list.build_stream_list();
|
|
|
|
|
|
|
|
// pinned streams
|
|
|
|
var develSub = {
|
|
|
|
name: 'devel',
|
|
|
|
stream_id: 1000,
|
|
|
|
color: 'blue',
|
|
|
|
pin_to_top: true,
|
|
|
|
subscribed: true,
|
|
|
|
};
|
|
|
|
add_row(develSub);
|
|
|
|
|
|
|
|
var RomeSub = {
|
|
|
|
name: 'Rome',
|
|
|
|
stream_id: 2000,
|
|
|
|
color: 'blue',
|
|
|
|
pin_to_top: true,
|
|
|
|
subscribed: true,
|
|
|
|
};
|
|
|
|
add_row(RomeSub);
|
|
|
|
// dorment stream
|
|
|
|
var DenmarkSub = {
|
|
|
|
name: 'Denmark',
|
|
|
|
stream_id: 3000,
|
|
|
|
color: 'blue',
|
|
|
|
pin_to_top: false,
|
|
|
|
subscribed: true,
|
|
|
|
};
|
|
|
|
add_row(DenmarkSub);
|
|
|
|
|
|
|
|
global.stream_data.is_active = function (sub) {
|
|
|
|
return sub.name !== 'Denmark';
|
|
|
|
};
|
|
|
|
|
|
|
|
var appended_elems;
|
|
|
|
$('#stream_filters').append = function (elems) {
|
|
|
|
appended_elems = elems;
|
|
|
|
};
|
|
|
|
|
|
|
|
stream_list.build_stream_list();
|
|
|
|
|
|
|
|
var split = '<hr class="stream-split">';
|
|
|
|
var expected_elems = [
|
|
|
|
// pinned
|
|
|
|
$('<devel sidebar row html>'),
|
|
|
|
$('<Rome sidebar row html>'),
|
|
|
|
split,
|
|
|
|
// dormant
|
|
|
|
$('<Denmark sidebar row html>'),
|
|
|
|
];
|
|
|
|
|
|
|
|
assert.deepEqual(appended_elems, expected_elems);
|
|
|
|
|
|
|
|
}());
|
|
|
|
|
|
|
|
(function test_separators_only_pinned() {
|
|
|
|
|
|
|
|
// Test only pinned streams
|
|
|
|
|
|
|
|
stream_data.clear_subscriptions();
|
|
|
|
|
|
|
|
// Get coverage on early-exit.
|
|
|
|
stream_list.build_stream_list();
|
|
|
|
|
|
|
|
// pinned streams
|
|
|
|
var develSub = {
|
|
|
|
name: 'devel',
|
|
|
|
stream_id: 1000,
|
|
|
|
color: 'blue',
|
|
|
|
pin_to_top: true,
|
|
|
|
subscribed: true,
|
|
|
|
};
|
|
|
|
add_row(develSub);
|
|
|
|
|
|
|
|
var RomeSub = {
|
|
|
|
name: 'Rome',
|
|
|
|
stream_id: 2000,
|
|
|
|
color: 'blue',
|
|
|
|
pin_to_top: true,
|
|
|
|
subscribed: true,
|
|
|
|
};
|
|
|
|
add_row(RomeSub);
|
|
|
|
|
|
|
|
|
|
|
|
var appended_elems;
|
|
|
|
$('#stream_filters').append = function (elems) {
|
|
|
|
appended_elems = elems;
|
|
|
|
};
|
|
|
|
|
|
|
|
stream_list.build_stream_list();
|
|
|
|
|
|
|
|
var expected_elems = [
|
|
|
|
// pinned
|
|
|
|
$('<devel sidebar row html>'),
|
|
|
|
$('<Rome sidebar row html>'),
|
|
|
|
// no separator at the end as no stream follows
|
|
|
|
];
|
|
|
|
|
|
|
|
assert.deepEqual(appended_elems, expected_elems);
|
|
|
|
|
|
|
|
}());
|
2017-06-14 00:27:06 +02:00
|
|
|
(function test_update_count_in_dom() {
|
2017-07-08 15:16:19 +02:00
|
|
|
function make_elem(elem, count_selector, value_selector) {
|
2017-06-14 18:21:50 +02:00
|
|
|
var count = $(count_selector);
|
|
|
|
var value = $(value_selector);
|
2017-07-08 14:31:18 +02:00
|
|
|
elem.set_find_results('.count', count);
|
|
|
|
count.set_find_results('.value', value);
|
2017-07-08 14:05:49 +02:00
|
|
|
count.set_parent(elem);
|
2017-06-14 18:21:50 +02:00
|
|
|
|
|
|
|
return elem;
|
|
|
|
}
|
|
|
|
|
|
|
|
var stream_li = make_elem(
|
2017-07-08 15:16:19 +02:00
|
|
|
$('<stream li>'),
|
|
|
|
'<stream-count>',
|
|
|
|
'<stream-value>'
|
2017-06-14 18:21:50 +02:00
|
|
|
);
|
|
|
|
|
|
|
|
stream_li.addClass('subscription_block');
|
|
|
|
stream_li.addClass('stream-with-count');
|
|
|
|
assert(stream_li.hasClass('stream-with-count'));
|
|
|
|
|
|
|
|
var stream_count = new Dict();
|
|
|
|
var stream_id = 11;
|
|
|
|
|
|
|
|
var stream_row = {
|
|
|
|
get_li: function () { return stream_li; },
|
|
|
|
};
|
|
|
|
|
|
|
|
stream_list.stream_sidebar.set_row(stream_id, stream_row);
|
|
|
|
|
|
|
|
stream_count.set(stream_id, 0);
|
|
|
|
var counts = {
|
|
|
|
stream_count: stream_count,
|
2017-07-31 14:04:20 +02:00
|
|
|
topic_count: new Dict(),
|
2017-06-14 18:21:50 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
stream_list.update_dom_with_unread_counts(counts);
|
2017-07-08 15:16:19 +02:00
|
|
|
assert.equal($('<stream li>').text(), 'never-been-set');
|
2017-06-14 18:21:50 +02:00
|
|
|
assert(!stream_li.hasClass('stream-with-count'));
|
|
|
|
|
|
|
|
stream_count.set(stream_id, 99);
|
|
|
|
|
|
|
|
stream_list.update_dom_with_unread_counts(counts);
|
2017-07-08 15:16:19 +02:00
|
|
|
assert.equal($('<stream-value>').text(), '99');
|
2017-06-14 18:21:50 +02:00
|
|
|
assert(stream_li.hasClass('stream-with-count'));
|
|
|
|
|
|
|
|
var topic_results;
|
|
|
|
|
|
|
|
topic_list.set_count = function (stream_id, topic, count) {
|
|
|
|
topic_results = {
|
|
|
|
stream_id: stream_id,
|
|
|
|
topic: topic,
|
|
|
|
count: count,
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
var topic_count = new Dict({fold_case: true});
|
|
|
|
topic_count.set('lunch', '555');
|
2017-07-31 14:04:20 +02:00
|
|
|
counts.topic_count.set(stream_id, topic_count);
|
2017-06-14 18:21:50 +02:00
|
|
|
|
|
|
|
stream_list.update_dom_with_unread_counts(counts);
|
|
|
|
|
|
|
|
assert.deepEqual(topic_results, {
|
|
|
|
stream_id: stream_id,
|
|
|
|
topic: 'lunch',
|
|
|
|
count: 555,
|
|
|
|
});
|
2017-06-14 00:27:06 +02:00
|
|
|
}());
|
2017-06-14 14:33:04 +02:00
|
|
|
|
|
|
|
(function test_create_initial_sidebar_rows() {
|
|
|
|
initialize_stream_data();
|
|
|
|
|
|
|
|
var html_dict = new Dict();
|
|
|
|
|
|
|
|
stream_list.stream_sidebar = {
|
|
|
|
has_row_for: return_false,
|
|
|
|
set_row: function (stream_id, widget) {
|
|
|
|
html_dict.set(stream_id, widget.get_li().html());
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
stream_list.update_count_in_dom = noop;
|
|
|
|
|
|
|
|
global.templates.render = function (template_name, data) {
|
|
|
|
assert.equal(template_name, 'stream_sidebar_row');
|
|
|
|
return '<div>stub-html-' + data.name;
|
|
|
|
};
|
|
|
|
|
|
|
|
// Test this code with stubs above...
|
|
|
|
stream_list.create_initial_sidebar_rows();
|
|
|
|
|
|
|
|
assert.equal(html_dict.get(1000), '<div>stub-html-devel');
|
|
|
|
assert.equal(html_dict.get(5000), '<div>stub-html-Denmark');
|
|
|
|
}());
|
2017-08-10 15:49:04 +02:00
|
|
|
|
|
|
|
(function test_scroll_delta() {
|
|
|
|
// If we are entirely on-screen, don't scroll
|
|
|
|
assert.equal(0, stream_list.scroll_delta({
|
|
|
|
elem_top: 1,
|
|
|
|
elem_bottom: 9,
|
|
|
|
container_height: 10,
|
|
|
|
}));
|
|
|
|
|
2017-08-10 16:35:48 +02:00
|
|
|
assert.equal(0, stream_list.scroll_delta({
|
|
|
|
elem_top: -5,
|
|
|
|
elem_bottom: 15,
|
|
|
|
container_height: 10,
|
|
|
|
}));
|
|
|
|
|
2017-08-10 15:49:04 +02:00
|
|
|
// The top is offscreen.
|
|
|
|
assert.equal(-3, stream_list.scroll_delta({
|
|
|
|
elem_top: -3,
|
|
|
|
elem_bottom: 5,
|
|
|
|
container_height: 10,
|
|
|
|
}));
|
|
|
|
|
|
|
|
assert.equal(-3, stream_list.scroll_delta({
|
|
|
|
elem_top: -3,
|
|
|
|
elem_bottom: -1,
|
|
|
|
container_height: 10,
|
|
|
|
}));
|
|
|
|
|
2017-08-10 16:35:48 +02:00
|
|
|
assert.equal(-11, stream_list.scroll_delta({
|
|
|
|
elem_top: -150,
|
|
|
|
elem_bottom: -1,
|
|
|
|
container_height: 10,
|
|
|
|
}));
|
|
|
|
|
2017-08-10 15:49:04 +02:00
|
|
|
// The bottom is offscreen.
|
|
|
|
assert.equal(3, stream_list.scroll_delta({
|
|
|
|
elem_top: 7,
|
|
|
|
elem_bottom: 13,
|
|
|
|
container_height: 10,
|
|
|
|
}));
|
|
|
|
|
|
|
|
assert.equal(3, stream_list.scroll_delta({
|
|
|
|
elem_top: 11,
|
|
|
|
elem_bottom: 13,
|
|
|
|
container_height: 10,
|
|
|
|
}));
|
|
|
|
|
2017-08-10 16:35:48 +02:00
|
|
|
assert.equal(11, stream_list.scroll_delta({
|
|
|
|
elem_top: 11,
|
|
|
|
elem_bottom: 99,
|
|
|
|
container_height: 10,
|
|
|
|
}));
|
|
|
|
|
2017-08-10 15:49:04 +02:00
|
|
|
}());
|