Skip to content

C
converse.js
Commit f7cf1fb7 authored by JC Brand's avatar JC Brand
Browse files
Options

Fix broken tests

parent 16b8946d
Show whitespace changes
Inline Side-by-side
Showing with 67 additions and 51 deletions
package-lock.json
View file @ f7cf1fb7
...@@ -1009,14 +1009,14 @@ ...@@ -1009,14 +1009,14 @@
"dev": true "dev": true
}, },
"backbone.overview": { "backbone.overview": {
"version": "git+https://github.com/jcbrand/Backbone.Overview.git#2c37461bfa8d9e8bcf8284033d3242c57eafb52d", "version": "git+https://github.com/jcbrand/Backbone.Overview.git#16239768880044f402edbdb1843220c44204cf15",
"dev": true, "dev": true,
"requires": { "requires": {
"backbone": "1.3.3" "backbone": "1.3.3"
} }
}, },
"backbone.vdomview": { "backbone.vdomview": {
"version": "git+https://github.com/jcbrand/backbone.vdomview.git#f781547e9a5ce401ac4334930d74b791168114ef", "version": "git+https://github.com/jcbrand/backbone.vdomview.git#e685de2ef5a810a87efe886b35c99ce0b3ab8f82",
"dev": true, "dev": true,
"requires": { "requires": {
"backbone": "1.3.3" "backbone": "1.3.3"
......
spec/roster.js
View file @ f7cf1fb7
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
var $iq = converse.env.$iq; var $iq = converse.env.$iq;
var u = converse.env.utils; var u = converse.env.utils;
var checkHeaderToggling = function ($group) { var checkHeaderToggling = function (group) {
var $group = $(group);
var $toggle = $group.find('a.group-toggle'); var $toggle = $group.find('a.group-toggle');
expect(u.isVisible($group[0])).toBeTruthy(); expect(u.isVisible($group[0])).toBeTruthy();
expect($group.find('ul.collapsed').length).toBe(0); expect($group.find('ul.collapsed').length).toBe(0);
...@@ -40,7 +41,7 @@ ...@@ -40,7 +41,7 @@
null, ['rosterGroupsFetched'], {}, null, ['rosterGroupsFetched'], {},
function (done, _converse) { function (done, _converse) {
var $filter = _converse.rosterview.$('.roster-filter'); var $filter = $(_converse.rosterview.el.querySelector('.roster-filter'));
var names = mock.cur_names; var names = mock.cur_names;
test_utils.openControlBox(); test_utils.openControlBox();
_converse.rosterview.update(); // XXX: Will normally called as event handler _converse.rosterview.update(); // XXX: Will normally called as event handler
...@@ -89,7 +90,7 @@ ...@@ -89,7 +90,7 @@
_converse.roster_groups = true; _converse.roster_groups = true;
test_utils.openControlBox(); test_utils.openControlBox();
test_utils.createGroupedContacts(_converse); test_utils.createGroupedContacts(_converse);
var $filter = _converse.rosterview.$('.roster-filter'); var $filter = $(_converse.rosterview.el).find('.roster-filter');
var $roster = $(_converse.rosterview.roster_el); var $roster = $(_converse.rosterview.roster_el);
_converse.rosterview.filter_view.delegateEvents(); _converse.rosterview.filter_view.delegateEvents();
...@@ -97,8 +98,9 @@ ...@@ -97,8 +98,9 @@
return $roster.find('li:visible').length === 15; return $roster.find('li:visible').length === 15;
}, 600).then(function (contacts) { }, 600).then(function (contacts) {
expect($roster.find('ul.roster-group-contacts:visible').length).toBe(5); expect($roster.find('ul.roster-group-contacts:visible').length).toBe(5);
$filter.val("candice"); $filter[0].value = "candice";
$filter.trigger('keydown'); u.triggerEvent($filter[0], "keydown", "KeyboardEvent");
return test_utils.waitUntil(function () { return test_utils.waitUntil(function () {
return $roster.find('li:visible').length === 1; return $roster.find('li:visible').length === 1;
}, 600); }, 600);
...@@ -110,9 +112,10 @@ ...@@ -110,9 +112,10 @@
expect($roster.find('.roster-group:visible').length).toBe(1); expect($roster.find('.roster-group:visible').length).toBe(1);
expect(_.trim($roster.find('.roster-group:visible a.group-toggle').eq(0).text())).toBe('colleagues'); expect(_.trim($roster.find('.roster-group:visible a.group-toggle').eq(0).text())).toBe('colleagues');
$filter = _converse.rosterview.$('.roster-filter'); $filter = $(_converse.rosterview.el).find('.roster-filter');
$filter.val("an"); $filter.val("an");
$filter.trigger('keydown'); u.triggerEvent($filter[0], "keydown", "KeyboardEvent");
return test_utils.waitUntil(function () { return test_utils.waitUntil(function () {
return $roster.find('li:visible').length === 5; return $roster.find('li:visible').length === 5;
}, 600) }, 600)
...@@ -127,17 +130,18 @@ ...@@ -127,17 +130,18 @@
expect(_.trim($groups.eq(2).text())).toBe('friends & acquaintences'); expect(_.trim($groups.eq(2).text())).toBe('friends & acquaintences');
expect(_.trim($groups.eq(3).text())).toBe('ænemies'); expect(_.trim($groups.eq(3).text())).toBe('ænemies');
$filter = _converse.rosterview.$('.roster-filter'); $filter = $(_converse.rosterview.el).find('.roster-filter');
$filter.val("xxx"); $filter.val("xxx");
$filter.trigger('keydown'); u.triggerEvent($filter[0], "keydown", "KeyboardEvent");
return test_utils.waitUntil(function () { return test_utils.waitUntil(function () {
return $roster.find('li:visible').length === 0; return $roster.find('li:visible').length === 0;
}, 600) }, 600)
}).then(function () { }).then(function () {
expect($roster.find('ul.roster-group-contacts:visible a.group-toggle').length).toBe(0); expect($roster.find('ul.roster-group-contacts:visible a.group-toggle').length).toBe(0);
$filter = _converse.rosterview.$('.roster-filter'); $filter = $(_converse.rosterview.el).find('.roster-filter');
$filter.val(""); // Check that contacts are shown again, when the filter string is cleared. $filter.val(""); // Check that contacts are shown again, when the filter string is cleared.
$filter.trigger('keydown'); u.triggerEvent($filter[0], "keydown", "KeyboardEvent");
return test_utils.waitUntil(function () { return test_utils.waitUntil(function () {
return $roster.find('li:visible').length === 15; return $roster.find('li:visible').length === 15;
}, 600) }, 600)
...@@ -156,7 +160,7 @@ ...@@ -156,7 +160,7 @@
test_utils.openControlBox(); test_utils.openControlBox();
test_utils.createGroupedContacts(_converse); test_utils.createGroupedContacts(_converse);
var $filter = _converse.rosterview.$('.roster-filter'); var $filter = $(_converse.rosterview.el).find('.roster-filter');
var $roster = $(_converse.rosterview.roster_el); var $roster = $(_converse.rosterview.roster_el);
_converse.rosterview.filter_view.delegateEvents(); _converse.rosterview.filter_view.delegateEvents();
...@@ -164,7 +168,8 @@ ...@@ -164,7 +168,8 @@
return $roster.find('li:visible').length === 15; return $roster.find('li:visible').length === 15;
}, 300).then(function (contacts) { }, 300).then(function (contacts) {
$filter.val("an"); $filter.val("an");
$filter.trigger('keydown'); u.triggerEvent($filter[0], "keydown", "KeyboardEvent");
return test_utils.waitUntil(function () { return test_utils.waitUntil(function () {
return $roster.find('li:visible').length === 5; return $roster.find('li:visible').length === 5;
}, 500) }, 500)
...@@ -208,17 +213,16 @@ ...@@ -208,17 +213,16 @@
test_utils.openControlBox(); test_utils.openControlBox();
test_utils.createGroupedContacts(_converse); test_utils.createGroupedContacts(_converse);
_converse.rosterview.filter_view.delegateEvents(); _converse.rosterview.filter_view.delegateEvents();
$filter = _converse.rosterview.$('.roster-filter'); $filter = $(_converse.rosterview.el).find('.roster-filter');
var $roster = $(_converse.rosterview.roster_el); var $roster = $(_converse.rosterview.roster_el);
$type = _converse.rosterview.$('.filter-type'); $type = $(_converse.rosterview.el).find('.filter-type');
$type.val('groups'); $type.val('groups');
test_utils.waitUntil(function () { test_utils.waitUntil(function () {
return $roster.find('li:visible').length === 15; return $roster.find('li:visible').length === 15;
}, 600).then(function () { }, 600).then(function () {
expect($roster.find('div.roster-group:visible a.group-toggle').length).toBe(5); expect($roster.find('div.roster-group:visible a.group-toggle').length).toBe(5);
$filter.val("colleagues"); $filter.val("colleagues");
$filter.trigger('keydown'); u.triggerEvent($filter[0], "keydown", "KeyboardEvent");
return test_utils.waitUntil(function () { return test_utils.waitUntil(function () {
return $roster.find('div.roster-group:not(.collapsed) a.group-toggle').length === 1; return $roster.find('div.roster-group:not(.collapsed) a.group-toggle').length === 1;
}, 600); }, 600);
...@@ -229,17 +233,19 @@ ...@@ -229,17 +233,19 @@
// Check that all contacts under the group are shown // Check that all contacts under the group are shown
expect($roster.find('div.roster-group:not(.collapsed) li:hidden').length).toBe(0); expect($roster.find('div.roster-group:not(.collapsed) li:hidden').length).toBe(0);
$filter = _converse.rosterview.$('.roster-filter'); $filter = $(_converse.rosterview.el).find('.roster-filter');
$filter.val("xxx").trigger('keydown'); $filter.val("xxx");
u.triggerEvent($filter[0], "keydown", "KeyboardEvent");
return test_utils.waitUntil(function () { return test_utils.waitUntil(function () {
return $roster.find('div.roster-group.collapsed a.group-toggle').length === 5; return $roster.find('div.roster-group.collapsed a.group-toggle').length === 5;
}, 700); }, 700);
}).then(function () { }).then(function () {
expect($roster.find('div.roster-group:not(.collapsed) a').length).toBe(0); expect($roster.find('div.roster-group:not(.collapsed) a').length).toBe(0);
$filter = _converse.rosterview.$('.roster-filter'); $filter = $(_converse.rosterview.el).find('.roster-filter');
$filter.val(""); // Check that groups are shown again, when the filter string is cleared. $filter.val(""); // Check that groups are shown again, when the filter string is cleared.
$filter.trigger('keydown'); u.triggerEvent($filter[0], "keydown", "KeyboardEvent");
return test_utils.waitUntil(function () { return test_utils.waitUntil(function () {
return $roster.find('div.roster-group.collapsed a.group-toggle').length === 0; return $roster.find('div.roster-group.collapsed a.group-toggle').length === 0;
}, 600); }, 600);
...@@ -258,19 +264,19 @@ ...@@ -258,19 +264,19 @@
_converse.roster_groups = true; _converse.roster_groups = true;
test_utils.openControlBox(); test_utils.openControlBox();
test_utils.createGroupedContacts(_converse); test_utils.createGroupedContacts(_converse);
var $filter = _converse.rosterview.$('.roster-filter'); var $filter = $(_converse.rosterview.el).find('.roster-filter');
_converse.rosterview.filter_view.delegateEvents(); _converse.rosterview.filter_view.delegateEvents();
$filter.val("xxx"); $filter.val("xxx");
$filter.trigger('keydown'); u.triggerEvent($filter[0], "keydown", "KeyboardEvent");
expect($filter.hasClass("x")).toBeFalsy(); expect($filter.hasClass("x")).toBeFalsy();
$filter = _converse.rosterview.$('.roster-filter'); $filter = $(_converse.rosterview.el).find('.roster-filter');
test_utils.waitUntil(function () { test_utils.waitUntil(function () {
return _converse.rosterview.$('.roster-filter').hasClass("x"); return $(_converse.rosterview.el).find('.roster-filter').hasClass("x");
}, 900).then(function () { }, 900).then(function () {
var $filter = _converse.rosterview.$('.roster-filter'); var $filter = $(_converse.rosterview.el).find('.roster-filter');
$filter.addClass("onX")[0].click(); $filter.addClass("onX")[0].click();
return test_utils.waitUntil(function () { return test_utils.waitUntil(function () {
return !_converse.rosterview.$('.roster-filter').hasClass("x"); return !$(_converse.rosterview.el).find('.roster-filter').hasClass("x");
}, 900) }, 900)
}).then(function () { }).then(function () {
expect(document.querySelector('.roster-filter').value).toBe(""); expect(document.querySelector('.roster-filter').value).toBe("");
...@@ -291,9 +297,11 @@ ...@@ -291,9 +297,11 @@
test_utils.openControlBox(); test_utils.openControlBox();
_converse.rosterview.filter_view.delegateEvents(); _converse.rosterview.filter_view.delegateEvents();
var $type = _converse.rosterview.$('.filter-type'); var $type = $(_converse.rosterview.el).find('.filter-type');
$type.val('state').trigger('change'); $type.val('state')
$filter = _converse.rosterview.$('.state-type'); u.triggerEvent($type[0], "change");
$filter = $(_converse.rosterview.el).find('.state-type');
var $roster = $(_converse.rosterview.roster_el); var $roster = $(_converse.rosterview.roster_el);
test_utils.waitUntil(function () { test_utils.waitUntil(function () {
...@@ -301,15 +309,17 @@ ...@@ -301,15 +309,17 @@
}, 500).then(function () { }, 500).then(function () {
expect($roster.find('ul.roster-group-contacts:visible').length).toBe(5); expect($roster.find('ul.roster-group-contacts:visible').length).toBe(5);
$filter.val("online"); $filter.val("online");
$filter.trigger('change'); u.triggerEvent($filter[0], 'change');
return test_utils.waitUntil(function () { return test_utils.waitUntil(function () {
return $roster.find('li:visible').length === 1; return $roster.find('li:visible').length === 1;
}, 500) }, 500)
}).then(function () { }).then(function () {
expect($roster.find('li:visible').eq(0).text().trim()).toBe('Rinse Sommer'); expect($roster.find('li:visible').eq(0).text().trim()).toBe('Rinse Sommer');
expect($roster.find('ul.roster-group-contacts:visible').length).toBe(1); expect($roster.find('ul.roster-group-contacts:visible').length).toBe(1);
var $type = _converse.rosterview.$('.filter-type'); var $type = $(_converse.rosterview.el).find('.filter-type');
$type.val('contacts').trigger('change'); $type.val('contacts');
u.triggerEvent($type[0], 'change');
done(); done();
}); });
})); }));
...@@ -350,7 +360,7 @@ ...@@ -350,7 +360,7 @@
]); ]);
// Check that usernames appear alphabetically per group // Check that usernames appear alphabetically per group
_.each(_.keys(mock.groups), function (name) { _.each(_.keys(mock.groups), function (name) {
var $contacts = _converse.rosterview.$('.roster-group[data-group="'+name+'"] ul'); var $contacts = $(_converse.rosterview.el).find('.roster-group[data-group="'+name+'"] ul');
var names = $.map($contacts, function (o) { return $(o).text().trim(); }); var names = $.map($contacts, function (o) { return $(o).text().trim(); });
expect(names).toEqual(_.clone(names).sort()); expect(names).toEqual(_.clone(names).sort());
}); });
...@@ -429,7 +439,7 @@ ...@@ -429,7 +439,7 @@
}, 600).then(function () { }, 600).then(function () {
// Check that usernames appear alphabetically per group // Check that usernames appear alphabetically per group
_.each(groups, function (name) { _.each(groups, function (name) {
var $contacts = _converse.rosterview.$('.roster-group[data-group="'+name+'"] li'); var $contacts = $(_converse.rosterview.el).find('.roster-group[data-group="'+name+'"] ul li');
var names = $.map($contacts, function (o) { return $(o).text().trim(); }); var names = $.map($contacts, function (o) { return $(o).text().trim(); });
expect(names).toEqual(_.clone(names).sort()); expect(names).toEqual(_.clone(names).sort());
expect(names.length).toEqual(mock.cur_names.length); expect(names.length).toEqual(mock.cur_names.length);
...@@ -501,7 +511,7 @@ ...@@ -501,7 +511,7 @@
}, 500).then(function () { }, 500).then(function () {
checkHeaderToggling.apply( checkHeaderToggling.apply(
_converse, _converse,
[_converse.rosterview.get('Pending contacts').$el] [_converse.rosterview.get('Pending contacts').el]
).then(done); ).then(done);
}); });
})); }));
...@@ -615,14 +625,14 @@ ...@@ -615,14 +625,14 @@
if (typeof callback === "function") { return callback(); } if (typeof callback === "function") { return callback(); }
}); });
test_utils.waitUntil(function () { test_utils.waitUntil(function () {
var $pending_contacts = _converse.rosterview.get('Pending contacts').$el; var $pending_contacts = $(_converse.rosterview.get('Pending contacts').el);
return $pending_contacts.is(':visible') && $pending_contacts.find('li:visible').length; return $pending_contacts.is(':visible') && $pending_contacts.find('li:visible').length;
}, 700).then(function () { }, 700).then(function () {
$(_converse.rosterview.el).find(".pending-contact-name:contains('"+name+"')") $(_converse.rosterview.el).find(".pending-contact-name:contains('"+name+"')")
.parent().siblings('.remove-xmpp-contact')[0].click(); .parent().siblings('.remove-xmpp-contact')[0].click();
expect(window.confirm).toHaveBeenCalled(); expect(window.confirm).toHaveBeenCalled();
expect(_converse.connection.sendIQ).toHaveBeenCalled(); expect(_converse.connection.sendIQ).toHaveBeenCalled();
expect(_converse.rosterview.get('Pending contacts').$el.is(':visible')).toEqual(false); expect(u.isVisible(_converse.rosterview.get('Pending contacts').el)).toEqual(false);
done(); done();
}); });
})); }));
...@@ -663,10 +673,10 @@ ...@@ -663,10 +673,10 @@
expect(_converse.rosterview.update).toHaveBeenCalled(); expect(_converse.rosterview.update).toHaveBeenCalled();
} }
return test_utils.waitUntil(function () { return test_utils.waitUntil(function () {
return _converse.rosterview.get('Pending contacts').$el.find('li:visible').length; return $(_converse.rosterview.get('Pending contacts').el).find('li:visible').length;
}, 700).then(function () { }, 700).then(function () {
// Check that they are sorted alphabetically // Check that they are sorted alphabetically
t = _.reduce(_converse.rosterview.get('Pending contacts').$el.find('.pending-xmpp-contact span'), t = _.reduce(_converse.rosterview.get('Pending contacts').el.querySelectorAll('.pending-xmpp-contact span'),
function (result, value) { function (result, value) {
return result + _.trim(value.textContent); return result + _.trim(value.textContent);
}, ''); }, '');
...@@ -694,7 +704,7 @@ ...@@ -694,7 +704,7 @@
}, 500).then(function () { }, 500).then(function () {
checkHeaderToggling.apply( checkHeaderToggling.apply(
_converse, _converse,
[$(_converse.rosterview.el).find('.roster-group')] [_converse.rosterview.el.querySelector('.roster-group')]
).then(done); ).then(done);
}); });
})); }));
...@@ -746,7 +756,7 @@ ...@@ -746,7 +756,7 @@
return $(_converse.rosterview.el).find('li').length; return $(_converse.rosterview.el).find('li').length;
}, 600).then(function () { }, 600).then(function () {
// Check that they are sorted alphabetically // Check that they are sorted alphabetically
var t = _.reduce(_converse.rosterview.$('.roster-group') var t = _.reduce($(_converse.rosterview.el.querySelector('.roster-group'))
.find('.current-xmpp-contact.offline a.open-chat'), .find('.current-xmpp-contact.offline a.open-chat'),
function (result, value) { function (result, value) {
return result + _.trim(value.textContent); return result + _.trim(value.textContent);
...@@ -1066,7 +1076,7 @@ ...@@ -1066,7 +1076,7 @@
var i, children; var i, children;
var names = []; var names = [];
var addName = function (idx, item) { var addName = function (item) {
if (!$(item).hasClass('request-actions')) { if (!$(item).hasClass('request-actions')) {
names.push($(item).text().replace(/^\s+|\s+$/g, '')); names.push($(item).text().replace(/^\s+|\s+$/g, ''));
} }
...@@ -1085,13 +1095,13 @@ ...@@ -1085,13 +1095,13 @@
}); });
} }
test_utils.waitUntil(function () { test_utils.waitUntil(function () {
return _converse.rosterview.get('Contact requests').$el.find('li').length; return _converse.rosterview.get('Contact requests').el.querySelectorAll('li').length;
}, 700).then(function () { }, 700).then(function () {
expect(_converse.rosterview.update).toHaveBeenCalled(); expect(_converse.rosterview.update).toHaveBeenCalled();
// Check that they are sorted alphabetically // Check that they are sorted alphabetically
children = _converse.rosterview.get('Contact requests').$el.find('.requesting-xmpp-contact span'); children = _converse.rosterview.get('Contact requests').el.querySelectorAll('.requesting-xmpp-contact span');
names = []; names = [];
children.each(addName); _.each(children, addName);
expect(names.join('')).toEqual(mock.req_names.slice(0,mock.req_names.length+1).sort().join('')); expect(names.join('')).toEqual(mock.req_names.slice(0,mock.req_names.length+1).sort().join(''));
done(); done();
}); });
...@@ -1115,12 +1125,12 @@ ...@@ -1115,12 +1125,12 @@
test_utils.waitUntil(function () { test_utils.waitUntil(function () {
return $(_converse.rosterview.el).find('.roster-group:visible li').length; return $(_converse.rosterview.el).find('.roster-group:visible li').length;
}, 700).then(function () { }, 700).then(function () {
expect(_converse.rosterview.get('Contact requests').$el.is(':visible')).toEqual(true); expect(u.isVisible(_converse.rosterview.get('Contact requests').el)).toEqual(true);
$(_converse.rosterview.el).find(".req-contact-name:contains('"+name+"')") $(_converse.rosterview.el).find(".req-contact-name:contains('"+name+"')")
.parent().siblings('.request-actions') .parent().siblings('.request-actions')
.find('.decline-xmpp-request')[0].click(); .find('.decline-xmpp-request')[0].click();
expect(window.confirm).toHaveBeenCalled(); expect(window.confirm).toHaveBeenCalled();
expect(_converse.rosterview.get('Contact requests').$el.is(':visible')).toEqual(false); expect(u.isVisible(_converse.rosterview.get('Contact requests').el)).toEqual(false);
done(); done();
}); });
})); }));
...@@ -1136,7 +1146,7 @@ ...@@ -1136,7 +1146,7 @@
}, 700).then(function () { }, 700).then(function () {
checkHeaderToggling.apply( checkHeaderToggling.apply(
_converse, _converse,
[_converse.rosterview.get('Contact requests').$el] [_converse.rosterview.get('Contact requests').el]
).then(done); ).then(done);
}); });
})); }));
......
src/utils.js
View file @ f7cf1fb7
...@@ -605,5 +605,11 @@ ...@@ -605,5 +605,11 @@
return el.offsetWidth > 0 || el.offsetHeight > 0 || el.getClientRects().length > 0; return el.offsetWidth > 0 || el.offsetHeight > 0 || el.getClientRects().length > 0;
}; };
u.triggerEvent = function (el, name, type="Event", bubbles=true, cancelable=true) {
const evt = document.createEvent(type);
evt.initEvent(name, bubbles, cancelable);
el.dispatchEvent(evt);
};
return u; return u;
})); }));
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7