diff --git a/karma.conf.js b/karma.conf.js
index b31b03187..31324131c 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -41,6 +41,7 @@ module.exports = function(config) {
{ pattern: "src/headless/tests/eventemitter.js", type: 'module' },
{ pattern: "src/plugins/bookmark-views/tests/bookmarks.js", type: 'module' },
{ pattern: "src/plugins/chatview/tests/chatbox.js", type: 'module' },
+ { pattern: "src/plugins/chatview/tests/emojis.js", type: 'module' },
{ pattern: "src/plugins/chatview/tests/corrections.js", type: 'module' },
{ pattern: "src/plugins/chatview/tests/emojis.js", type: 'module' },
{ pattern: "src/plugins/chatview/tests/http-file-upload.js", type: 'module' },
@@ -59,6 +60,7 @@ module.exports = function(config) {
{ pattern: "src/plugins/muc-views/tests/autocomplete.js", type: 'module' },
{ pattern: "src/plugins/muc-views/tests/component.js", type: 'module' },
{ pattern: "src/plugins/muc-views/tests/corrections.js", type: 'module' },
+ { pattern: "src/plugins/muc-views/tests/emojis.js", type: 'module' },
{ pattern: "src/plugins/muc-views/tests/hats.js", type: 'module' },
{ pattern: "src/plugins/muc-views/tests/http-file-upload.js", type: 'module' },
{ pattern: "src/plugins/muc-views/tests/mentions.js", type: 'module' },
diff --git a/src/plugins/chatview/tests/emojis.js b/src/plugins/chatview/tests/emojis.js
new file mode 100644
index 000000000..26d4d3e38
--- /dev/null
+++ b/src/plugins/chatview/tests/emojis.js
@@ -0,0 +1,214 @@
+/*global mock, converse */
+
+const { Promise, $msg } = converse.env;
+const u = converse.env.utils;
+const original_timeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
+
+describe("Emojis", function () {
+ describe("The emoji picker", function () {
+
+ beforeEach(() => (jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000));
+ afterEach(() => (jasmine.DEFAULT_TIMEOUT_INTERVAL = original_timeout));
+
+ it("can be opened by clicking a button in the chat toolbar",
+ mock.initConverse(['chatBoxesFetched'], {}, async function (done, _converse) {
+
+ const contact_jid = mock.cur_names[2].replace(/ /g,'.').toLowerCase() + '@montague.lit';
+ await mock.waitForRoster(_converse, 'current');
+ await mock.openControlBox(_converse);
+ await mock.openChatBoxFor(_converse, contact_jid);
+ const view = _converse.chatboxviews.get(contact_jid);
+ const toolbar = await u.waitUntil(() => view.querySelector('converse-chat-toolbar'));
+ toolbar.querySelector('.toggle-emojis').click();
+ await u.waitUntil(() => u.isVisible(view.querySelector('.emoji-picker__lists')), 1000);
+ const item = view.querySelector('.emoji-picker li.insert-emoji a');
+ item.click()
+ expect(view.querySelector('textarea.chat-textarea').value).toBe(':smiley: ');
+ toolbar.querySelector('.toggle-emojis').click(); // Close the panel again
+ done();
+ }));
+ });
+
+ describe("A Chat Message", function () {
+
+ it("will display larger if it's only emojis",
+ mock.initConverse(['chatBoxesFetched'], {'use_system_emojis': true}, async function (done, _converse) {
+
+ await mock.waitForRoster(_converse, 'current');
+ const sender_jid = mock.cur_names[1].replace(/ /g,'.').toLowerCase() + '@montague.lit';
+ _converse.handleMessageStanza($msg({
+ 'from': sender_jid,
+ 'to': _converse.connection.jid,
+ 'type': 'chat',
+ 'id': _converse.connection.getUniqueId()
+ }).c('body').t('😇').up()
+ .c('active', {'xmlns': 'http://jabber.org/protocol/chatstates'}).tree());
+ await new Promise(resolve => _converse.on('chatBoxViewInitialized', resolve));
+ const view = _converse.api.chatviews.get(sender_jid);
+ await u.waitUntil(() => view.querySelectorAll('.chat-msg__text').length);
+ await u.waitUntil(() => u.hasClass('chat-msg__text--larger', view.querySelector('.chat-msg__text')));
+
+ _converse.handleMessageStanza($msg({
+ 'from': sender_jid,
+ 'to': _converse.connection.jid,
+ 'type': 'chat',
+ 'id': _converse.connection.getUniqueId()
+ }).c('body').t('😇 Hello world! 😇 😇').up()
+ .c('active', {'xmlns': 'http://jabber.org/protocol/chatstates'}).tree());
+ await u.waitUntil(() => view.querySelectorAll('.chat-msg__text').length === 2);
+
+ let sel = '.message:last-child .chat-msg__text';
+ await u.waitUntil(() => u.hasClass('chat-msg__text--larger', view.querySelector(sel)));
+
+ // Test that a modified message that no longer contains only
+ // emojis now renders normally again.
+ const textarea = view.querySelector('textarea.chat-textarea');
+ textarea.value = ':poop: :innocent:';
+ const message_form = view.querySelector('converse-message-form');
+ message_form.onKeyDown({
+ target: textarea,
+ preventDefault: function preventDefault () {},
+ keyCode: 13 // Enter
+ });
+ await u.waitUntil(() => view.querySelectorAll('.chat-msg__text').length === 3);
+ const last_msg_sel = 'converse-chat-message:last-child .chat-msg__text';
+ await u.waitUntil(() => view.querySelector(last_msg_sel).textContent === '💩 😇');
+
+ expect(textarea.value).toBe('');
+ message_form.onKeyDown({
+ target: textarea,
+ keyCode: 38 // Up arrow
+ });
+ expect(textarea.value).toBe('💩 😇');
+ expect(view.model.messages.at(2).get('correcting')).toBe(true);
+ sel = 'converse-chat-message:last-child .chat-msg'
+ await u.waitUntil(() => u.hasClass('correcting', view.querySelector(sel)), 500);
+ const edited_text = textarea.value += 'This is no longer an emoji-only message';
+ textarea.value = edited_text;
+ message_form.onKeyDown({
+ target: textarea,
+ preventDefault: function preventDefault () {},
+ keyCode: 13 // Enter
+ });
+ await u.waitUntil(() => Array.from(view.querySelectorAll('.chat-msg__text'))
+ .filter(el => el.textContent === edited_text).length);
+ expect(view.model.messages.models.length).toBe(3);
+ let message = view.querySelector(last_msg_sel);
+ expect(u.hasClass('chat-msg__text--larger', message)).toBe(false);
+
+ textarea.value = ':smile: Hello world!';
+ message_form.onKeyDown({
+ target: textarea,
+ preventDefault: function preventDefault () {},
+ keyCode: 13 // Enter
+ });
+ await u.waitUntil(() => view.querySelectorAll('.chat-msg__text').length === 4);
+
+ textarea.value = ':smile: :smiley: :imp:';
+ message_form.onKeyDown({
+ target: textarea,
+ preventDefault: function preventDefault () {},
+ keyCode: 13 // Enter
+ });
+ await u.waitUntil(() => view.querySelectorAll('.chat-msg__text').length === 5);
+
+ message = view.querySelector('.message:last-child .chat-msg__text');
+ expect(u.hasClass('chat-msg__text--larger', message)).toBe(true);
+ done()
+ }));
+
+ it("can render emojis as images",
+ mock.initConverse(
+ ['chatBoxesFetched'], {'use_system_emojis': false},
+ async function (done, _converse) {
+
+ await mock.waitForRoster(_converse, 'current');
+ const contact_jid = mock.cur_names[1].replace(/ /g,'.').toLowerCase() + '@montague.lit';
+ _converse.handleMessageStanza($msg({
+ 'from': contact_jid,
+ 'to': _converse.connection.jid,
+ 'type': 'chat',
+ 'id': _converse.connection.getUniqueId()
+ }).c('body').t('😇').up()
+ .c('active', {'xmlns': 'http://jabber.org/protocol/chatstates'}).tree());
+ await new Promise(resolve => _converse.on('chatBoxViewInitialized', resolve));
+ const view = _converse.api.chatviews.get(contact_jid);
+ await new Promise(resolve => view.model.messages.once('rendered', resolve));
+ await u.waitUntil(() => view.querySelector('.chat-msg__text').innerHTML.replace(//g, '') ===
+ '
');
+
+ const last_msg_sel = 'converse-chat-message:last-child .chat-msg__text';
+ let message = view.querySelector(last_msg_sel);
+ await u.waitUntil(() => u.isVisible(message.querySelector('.emoji')), 1000);
+ let imgs = message.querySelectorAll('.emoji');
+ expect(imgs.length).toBe(1);
+ expect(imgs[0].src).toBe(_converse.api.settings.get('emoji_image_path')+'/72x72/1f607.png');
+
+ const textarea = view.querySelector('textarea.chat-textarea');
+ textarea.value = ':poop: :innocent:';
+ const message_form = view.querySelector('converse-message-form');
+ message_form.onKeyDown({
+ target: textarea,
+ preventDefault: function preventDefault () {},
+ keyCode: 13 // Enter
+ });
+ await new Promise(resolve => view.model.messages.once('rendered', resolve));
+ message = view.querySelector(last_msg_sel);
+ await u.waitUntil(() => u.isVisible(message.querySelector('.emoji')), 1000);
+ imgs = message.querySelectorAll('.emoji');
+ expect(imgs.length).toBe(2);
+ expect(imgs[0].src).toBe(_converse.api.settings.get('emoji_image_path')+'/72x72/1f4a9.png');
+ expect(imgs[1].src).toBe(_converse.api.settings.get('emoji_image_path')+'/72x72/1f607.png');
+
+ const sent_stanzas = _converse.connection.sent_stanzas;
+ const sent_stanza = sent_stanzas.filter(s => s.nodeName === 'message').pop();
+ expect(sent_stanza.querySelector('body').innerHTML).toBe('💩 😇');
+ done()
+ }));
+
+ it("can show custom emojis",
+ mock.initConverse(
+ ['chatBoxesFetched'],
+ { emoji_categories: {
+ "smileys": ":grinning:",
+ "people": ":thumbsup:",
+ "activity": ":soccer:",
+ "travel": ":motorcycle:",
+ "objects": ":bomb:",
+ "nature": ":rainbow:",
+ "food": ":hotdog:",
+ "symbols": ":musical_note:",
+ "flags": ":flag_ac:",
+ "custom": ':xmpp:'
+ } },
+ async function (done, _converse) {
+
+ await mock.waitForRoster(_converse, 'current', 1);
+ const contact_jid = mock.cur_names[0].replace(/ /g,'.').toLowerCase() + '@montague.lit';
+ await mock.openChatBoxFor(_converse, contact_jid);
+ const view = _converse.api.chatviews.get(contact_jid);
+
+ const toolbar = await u.waitUntil(() => view.querySelector('.chat-toolbar'));
+ toolbar.querySelector('.toggle-emojis').click();
+ await u.waitUntil(() => u.isVisible(view.querySelector('.emoji-picker__lists')), 1000);
+ const picker = await u.waitUntil(() => view.querySelector('converse-emoji-picker'), 1000);
+ const custom_category = picker.querySelector('.pick-category[data-category="custom"]');
+ expect(custom_category.innerHTML.replace(//g, '').trim()).toBe(
+ '
');
+
+ const textarea = view.querySelector('textarea.chat-textarea');
+ textarea.value = 'Running tests for :converse:';
+ const message_form = view.querySelector('converse-message-form');
+ message_form.onKeyDown({
+ target: textarea,
+ preventDefault: function preventDefault () {},
+ keyCode: 13 // Enter
+ });
+ await new Promise(resolve => view.model.messages.once('rendered', resolve));
+ const body = view.querySelector('converse-chat-message-body');
+ await u.waitUntil(() => body.innerHTML.replace(//g, '').trim() ===
+ 'Running tests for 
');
+ done();
+ }));
+ });
+});
diff --git a/spec/emojis.js b/src/plugins/muc-views/tests/emojis.js
similarity index 51%
rename from spec/emojis.js
rename to src/plugins/muc-views/tests/emojis.js
index 410890191..77113c285 100644
--- a/spec/emojis.js
+++ b/src/plugins/muc-views/tests/emojis.js
@@ -1,34 +1,10 @@
/*global mock, converse */
-const { Promise, $msg, $pres, sizzle } = converse.env;
+const { $pres, sizzle } = converse.env;
const u = converse.env.utils;
-const original_timeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
-
describe("Emojis", function () {
describe("The emoji picker", function () {
-
- beforeEach(() => (jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000));
- afterEach(() => (jasmine.DEFAULT_TIMEOUT_INTERVAL = original_timeout));
-
- it("can be opened by clicking a button in the chat toolbar",
- mock.initConverse(['chatBoxesFetched'], {}, async function (done, _converse) {
-
- const contact_jid = mock.cur_names[2].replace(/ /g,'.').toLowerCase() + '@montague.lit';
- await mock.waitForRoster(_converse, 'current');
- await mock.openControlBox(_converse);
- await mock.openChatBoxFor(_converse, contact_jid);
- const view = _converse.chatboxviews.get(contact_jid);
- const toolbar = await u.waitUntil(() => view.querySelector('converse-chat-toolbar'));
- toolbar.querySelector('.toggle-emojis').click();
- await u.waitUntil(() => u.isVisible(view.querySelector('.emoji-picker__lists')), 1000);
- const item = view.querySelector('.emoji-picker li.insert-emoji a');
- item.click()
- expect(view.querySelector('textarea.chat-textarea').value).toBe(':smiley: ');
- toolbar.querySelector('.toggle-emojis').click(); // Close the panel again
- done();
- }));
-
it("is opened to autocomplete emojis in the textarea",
mock.initConverse(['chatBoxesFetched'], {}, async function (done, _converse) {
@@ -249,187 +225,4 @@ describe("Emojis", function () {
done();
}));
});
-
- describe("A Chat Message", function () {
-
- it("will display larger if it's only emojis",
- mock.initConverse(['chatBoxesFetched'], {'use_system_emojis': true}, async function (done, _converse) {
-
- await mock.waitForRoster(_converse, 'current');
- const sender_jid = mock.cur_names[1].replace(/ /g,'.').toLowerCase() + '@montague.lit';
- _converse.handleMessageStanza($msg({
- 'from': sender_jid,
- 'to': _converse.connection.jid,
- 'type': 'chat',
- 'id': _converse.connection.getUniqueId()
- }).c('body').t('😇').up()
- .c('active', {'xmlns': 'http://jabber.org/protocol/chatstates'}).tree());
- await new Promise(resolve => _converse.on('chatBoxViewInitialized', resolve));
- const view = _converse.api.chatviews.get(sender_jid);
- await u.waitUntil(() => view.querySelectorAll('.chat-msg__text').length);
- await u.waitUntil(() => u.hasClass('chat-msg__text--larger', view.querySelector('.chat-msg__text')));
-
- _converse.handleMessageStanza($msg({
- 'from': sender_jid,
- 'to': _converse.connection.jid,
- 'type': 'chat',
- 'id': _converse.connection.getUniqueId()
- }).c('body').t('😇 Hello world! 😇 😇').up()
- .c('active', {'xmlns': 'http://jabber.org/protocol/chatstates'}).tree());
- await u.waitUntil(() => view.querySelectorAll('.chat-msg__text').length === 2);
-
- let sel = '.message:last-child .chat-msg__text';
- await u.waitUntil(() => u.hasClass('chat-msg__text--larger', view.querySelector(sel)));
-
- // Test that a modified message that no longer contains only
- // emojis now renders normally again.
- const textarea = view.querySelector('textarea.chat-textarea');
- textarea.value = ':poop: :innocent:';
- const message_form = view.querySelector('converse-message-form');
- message_form.onKeyDown({
- target: textarea,
- preventDefault: function preventDefault () {},
- keyCode: 13 // Enter
- });
- await u.waitUntil(() => view.querySelectorAll('.chat-msg__text').length === 3);
- const last_msg_sel = 'converse-chat-message:last-child .chat-msg__text';
- await u.waitUntil(() => view.querySelector(last_msg_sel).textContent === '💩 😇');
-
- expect(textarea.value).toBe('');
- message_form.onKeyDown({
- target: textarea,
- keyCode: 38 // Up arrow
- });
- expect(textarea.value).toBe('💩 😇');
- expect(view.model.messages.at(2).get('correcting')).toBe(true);
- sel = 'converse-chat-message:last-child .chat-msg'
- await u.waitUntil(() => u.hasClass('correcting', view.querySelector(sel)), 500);
- const edited_text = textarea.value += 'This is no longer an emoji-only message';
- textarea.value = edited_text;
- message_form.onKeyDown({
- target: textarea,
- preventDefault: function preventDefault () {},
- keyCode: 13 // Enter
- });
- await u.waitUntil(() => Array.from(view.querySelectorAll('.chat-msg__text'))
- .filter(el => el.textContent === edited_text).length);
- expect(view.model.messages.models.length).toBe(3);
- let message = view.querySelector(last_msg_sel);
- expect(u.hasClass('chat-msg__text--larger', message)).toBe(false);
-
- textarea.value = ':smile: Hello world!';
- message_form.onKeyDown({
- target: textarea,
- preventDefault: function preventDefault () {},
- keyCode: 13 // Enter
- });
- await u.waitUntil(() => view.querySelectorAll('.chat-msg__text').length === 4);
-
- textarea.value = ':smile: :smiley: :imp:';
- message_form.onKeyDown({
- target: textarea,
- preventDefault: function preventDefault () {},
- keyCode: 13 // Enter
- });
- await u.waitUntil(() => view.querySelectorAll('.chat-msg__text').length === 5);
-
- message = view.querySelector('.message:last-child .chat-msg__text');
- expect(u.hasClass('chat-msg__text--larger', message)).toBe(true);
- done()
- }));
-
- it("can render emojis as images",
- mock.initConverse(
- ['chatBoxesFetched'], {'use_system_emojis': false},
- async function (done, _converse) {
-
- await mock.waitForRoster(_converse, 'current');
- const contact_jid = mock.cur_names[1].replace(/ /g,'.').toLowerCase() + '@montague.lit';
- _converse.handleMessageStanza($msg({
- 'from': contact_jid,
- 'to': _converse.connection.jid,
- 'type': 'chat',
- 'id': _converse.connection.getUniqueId()
- }).c('body').t('😇').up()
- .c('active', {'xmlns': 'http://jabber.org/protocol/chatstates'}).tree());
- await new Promise(resolve => _converse.on('chatBoxViewInitialized', resolve));
- const view = _converse.api.chatviews.get(contact_jid);
- await new Promise(resolve => view.model.messages.once('rendered', resolve));
- await u.waitUntil(() => view.querySelector('.chat-msg__text').innerHTML.replace(//g, '') ===
- '');
-
- const last_msg_sel = 'converse-chat-message:last-child .chat-msg__text';
- let message = view.querySelector(last_msg_sel);
- await u.waitUntil(() => u.isVisible(message.querySelector('.emoji')), 1000);
- let imgs = message.querySelectorAll('.emoji');
- expect(imgs.length).toBe(1);
- expect(imgs[0].src).toBe(_converse.api.settings.get('emoji_image_path')+'/72x72/1f607.png');
-
- const textarea = view.querySelector('textarea.chat-textarea');
- textarea.value = ':poop: :innocent:';
- const message_form = view.querySelector('converse-message-form');
- message_form.onKeyDown({
- target: textarea,
- preventDefault: function preventDefault () {},
- keyCode: 13 // Enter
- });
- await new Promise(resolve => view.model.messages.once('rendered', resolve));
- message = view.querySelector(last_msg_sel);
- await u.waitUntil(() => u.isVisible(message.querySelector('.emoji')), 1000);
- imgs = message.querySelectorAll('.emoji');
- expect(imgs.length).toBe(2);
- expect(imgs[0].src).toBe(_converse.api.settings.get('emoji_image_path')+'/72x72/1f4a9.png');
- expect(imgs[1].src).toBe(_converse.api.settings.get('emoji_image_path')+'/72x72/1f607.png');
-
- const sent_stanzas = _converse.connection.sent_stanzas;
- const sent_stanza = sent_stanzas.filter(s => s.nodeName === 'message').pop();
- expect(sent_stanza.querySelector('body').innerHTML).toBe('💩 😇');
- done()
- }));
-
- it("can show custom emojis",
- mock.initConverse(
- ['chatBoxesFetched'],
- { emoji_categories: {
- "smileys": ":grinning:",
- "people": ":thumbsup:",
- "activity": ":soccer:",
- "travel": ":motorcycle:",
- "objects": ":bomb:",
- "nature": ":rainbow:",
- "food": ":hotdog:",
- "symbols": ":musical_note:",
- "flags": ":flag_ac:",
- "custom": ':xmpp:'
- } },
- async function (done, _converse) {
-
- await mock.waitForRoster(_converse, 'current', 1);
- const contact_jid = mock.cur_names[0].replace(/ /g,'.').toLowerCase() + '@montague.lit';
- await mock.openChatBoxFor(_converse, contact_jid);
- const view = _converse.api.chatviews.get(contact_jid);
-
- const toolbar = await u.waitUntil(() => view.querySelector('.chat-toolbar'));
- toolbar.querySelector('.toggle-emojis').click();
- await u.waitUntil(() => u.isVisible(view.querySelector('.emoji-picker__lists')), 1000);
- const picker = await u.waitUntil(() => view.querySelector('converse-emoji-picker'), 1000);
- const custom_category = picker.querySelector('.pick-category[data-category="custom"]');
- expect(custom_category.innerHTML.replace(//g, '').trim()).toBe(
- '');
-
- const textarea = view.querySelector('textarea.chat-textarea');
- textarea.value = 'Running tests for :converse:';
- const message_form = view.querySelector('converse-message-form');
- message_form.onKeyDown({
- target: textarea,
- preventDefault: function preventDefault () {},
- keyCode: 13 // Enter
- });
- await new Promise(resolve => view.model.messages.once('rendered', resolve));
- const body = view.querySelector('converse-chat-message-body');
- await u.waitUntil(() => body.innerHTML.replace(//g, '').trim() ===
- 'Running tests for ');
- done();
- }));
- });
});