Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Fix emoji test (now that bootstrap dropdown is used)

Browse Source
This commit is contained in:
JC Brand 2018-03-14 17:25:34 +00:00
parent 2045741fbe
commit 2ff18c2cfb
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
spec/chatbox.js
View File

@ -441,6 +441,8 @@
view.delegateEvents(); // We need to rebind all events otherwise our spy won't be called
toolbar.querySelector('li.toggle-smiley').click();
var timeout = false;
test_utils.waitUntil(function () {
return utils.isVisible(view.el.querySelector('.toggle-smiley .emoji-picker-container'));
}, 150).then(function () {
@ -448,10 +450,22 @@
var items = picker.querySelectorAll('.emoji-picker li');
items[0].click()
expect(view.insertEmoji).toHaveBeenCalled();
setTimeout(function () { timeout = true; }, 100);
return test_utils.waitUntil(function () {
return timeout;
}, 300);
}).then(function () {
timeout = false;
toolbar.querySelector('li.toggle-smiley').click(); // Close the panel again
return test_utils.waitUntil(function () {
return !view.el.querySelector('.toggle-smiley .toolbar-menu').offsetHeight;
}, 900);
}, 300);
}).then(function () {
setTimeout(function () { timeout = true; }, 100);
return test_utils.waitUntil(function () {
return timeout;
}, 300);
}).then(function () {
toolbar.querySelector('li.toggle-smiley').click();
expect(view.toggleEmojiMenu).toHaveBeenCalled();
@ -485,12 +499,12 @@
test_utils.openChatBoxFor(_converse, contact_jid);
var view = _converse.chatboxviews.get(contact_jid);
var $toolbar = $(view.el).find('ul.chat-toolbar');
expect($toolbar.children('li.toggle-otr').length).toBe(1);
expect($toolbar.children('.toggle-otr').length).toBe(1);
// Register spies
spyOn(view, 'toggleOTRMenu').and.callThrough();
view.delegateEvents(); // We need to rebind all events otherwise our spy won't be called
$toolbar[0].querySelector('li.toggle-otr').click();
$toolbar[0].querySelector('.toggle-otr').click();
expect(view.toggleOTRMenu).toHaveBeenCalled();
done();
});

1
src/converse-core.js
View File

@ -66,6 +66,7 @@
_.extend(_converse, Backbone.Events);
// Core plugins are whitelisted automatically
_converse.core_plugins = [
'converse-bookmarks',
'converse-chatboxes',