|
|
@@ -21,9 +21,9 @@
|
|
|
null, ['rosterGroupsFetched'], {},
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'montague.lit', 'romeo');
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'leisure', 'montague.lit', 'romeo');
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'news', 'montague.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'leisure@montague.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'news@montague.lit', 'romeo');
|
|
|
expect(u.isVisible(_converse.chatboxviews.get('lounge@montague.lit').el)).toBeTruthy();
|
|
|
expect(u.isVisible(_converse.chatboxviews.get('leisure@montague.lit').el)).toBeTruthy();
|
|
|
expect(u.isVisible(_converse.chatboxviews.get('news@montague.lit').el)).toBeTruthy();
|
|
|
@@ -37,8 +37,8 @@
|
|
|
expect(_converse.chatboxviews.get('lounge@montague.lit')).toBeUndefined();
|
|
|
expect(_converse.chatboxviews.get('leisure@montague.lit')).toBeUndefined();
|
|
|
expect(_converse.chatboxviews.get('news@montague.lit')).toBeUndefined();
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'montague.lit', 'romeo');
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'leisure', 'montague.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'leisure@montague.lit', 'romeo');
|
|
|
expect(u.isVisible(_converse.chatboxviews.get('lounge@montague.lit').el)).toBeTruthy();
|
|
|
expect(u.isVisible(_converse.chatboxviews.get('leisure@montague.lit').el)).toBeTruthy();
|
|
|
_converse.api.roomviews.close();
|
|
|
@@ -54,7 +54,7 @@
|
|
|
|
|
|
test_utils.createContacts(_converse, 'current');
|
|
|
await test_utils.waitUntil(() => _converse.rosterview.el.querySelectorAll('.roster-group .group-toggle').length, 300);
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'chillout', 'montague.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'chillout@montague.lit', 'romeo');
|
|
|
let jid = 'chillout@montague.lit';
|
|
|
let room = _converse.api.rooms.get(jid);
|
|
|
expect(room instanceof Object).toBeTruthy();
|
|
|
@@ -66,7 +66,7 @@
|
|
|
chatroomview.close();
|
|
|
|
|
|
// Test with mixed case
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'Leisure', 'montague.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'Leisure@montague.lit', 'romeo');
|
|
|
jid = 'Leisure@montague.lit';
|
|
|
room = _converse.api.rooms.get(jid);
|
|
|
expect(room instanceof Object).toBeTruthy();
|
|
|
@@ -269,7 +269,7 @@
|
|
|
|
|
|
const IQ_stanzas = _converse.connection.IQ_stanzas;
|
|
|
const sendIQ = _converse.connection.sendIQ;
|
|
|
- const room_jid = 'lounge@montague.lit';
|
|
|
+ const muc_jid = 'lounge@montague.lit';
|
|
|
let sent_IQ, IQ_id;
|
|
|
spyOn(_converse.connection, 'sendIQ').and.callFake(function (iq, callback, errback) {
|
|
|
if (iq.nodeTree.getAttribute('to') === 'lounge@montague.lit') {
|
|
|
@@ -283,7 +283,7 @@
|
|
|
let stanza = await test_utils.waitUntil(() => _.filter(
|
|
|
IQ_stanzas,
|
|
|
iq => iq.querySelector(
|
|
|
- `iq[to="${room_jid}"] query[xmlns="http://jabber.org/protocol/disco#info"]`
|
|
|
+ `iq[to="${muc_jid}"] query[xmlns="http://jabber.org/protocol/disco#info"]`
|
|
|
)).pop());
|
|
|
// We pretend this is a new room, so no disco info is returned.
|
|
|
|
|
|
@@ -317,7 +317,7 @@
|
|
|
*/
|
|
|
stanza = await test_utils.waitUntil(() => _.filter(
|
|
|
IQ_stanzas,
|
|
|
- s => sizzle(`iq[to="${room_jid}"] query[node="x-roomuser-item"]`, s).length
|
|
|
+ s => sizzle(`iq[to="${muc_jid}"] query[node="x-roomuser-item"]`, s).length
|
|
|
).pop()
|
|
|
);
|
|
|
expect(Strophe.serialize(stanza)).toBe(
|
|
|
@@ -400,7 +400,7 @@
|
|
|
null, ['rosterGroupsFetched'], {},
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
- await test_utils.waitUntil(() => test_utils.openAndEnterChatRoom(_converse, 'lounge', 'montague.lit', 'romeo'));
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
|
|
|
const view = _converse.chatboxviews.get('lounge@montague.lit');
|
|
|
const message = 'Hello world',
|
|
|
nick = mock.chatroom_names[0],
|
|
|
@@ -428,7 +428,7 @@
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
test_utils.createContacts(_converse, 'current');
|
|
|
- await test_utils.waitUntil(() => test_utils.openAndEnterChatRoom(_converse, 'lounge', 'montague.lit', 'romeo'));
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
|
|
|
const view = _converse.chatboxviews.get('lounge@montague.lit');
|
|
|
if (!view.el.querySelectorAll('.chat-area').length) {
|
|
|
view.renderChatArea();
|
|
|
@@ -770,7 +770,7 @@
|
|
|
null, ['rosterGroupsFetched', 'chatBoxesFetched'], {},
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'coven', 'chat.shakespeare.lit', 'romeo')
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'coven@chat.shakespeare.lit', 'romeo')
|
|
|
const view = _converse.chatboxviews.get('coven@chat.shakespeare.lit');
|
|
|
const chat_content = view.el.querySelector('.chat-content');
|
|
|
|
|
|
@@ -922,7 +922,7 @@
|
|
|
null, ['rosterGroupsFetched', 'chatBoxesFetched'], {'muc_show_join_leave_status': false},
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, "coven", 'chat.shakespeare.lit', 'some1');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'coven@chat.shakespeare.lit', 'some1');
|
|
|
const view = _converse.chatboxviews.get('coven@chat.shakespeare.lit');
|
|
|
const chat_content = view.el.querySelector('.chat-content');
|
|
|
expect(sizzle('div.chat-info', chat_content).pop().textContent).toBe('some1 has entered the groupchat');
|
|
|
@@ -999,7 +999,7 @@
|
|
|
|
|
|
// See https://github.com/conversejs/converse.js/issues/1259
|
|
|
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'conversations', 'conference.siacs.eu', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'conversations@conference.siacs.eu', 'romeo');
|
|
|
|
|
|
const presence = $pres({
|
|
|
to: 'romeo@montague.lit/orchard',
|
|
|
@@ -1059,7 +1059,7 @@
|
|
|
null, ['rosterGroupsFetched'], {},
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'coven', 'chat.shakespeare.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'coven@chat.shakespeare.lit', 'romeo');
|
|
|
const view = _converse.chatboxviews.get('coven@chat.shakespeare.lit');
|
|
|
const chat_content = view.el.querySelector('.chat-content');
|
|
|
let indicator = chat_content.querySelector('.date-separator');
|
|
|
@@ -1224,7 +1224,7 @@
|
|
|
await test_utils.waitUntilDiscoConfirmed(_converse, 'montague.lit', [], ['vcard-temp']);
|
|
|
await test_utils.waitUntil(() => _converse.xmppstatus.vcard.get('fullname'));
|
|
|
test_utils.createContacts(_converse, 'current');
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'montague.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
|
|
|
const view = _converse.chatboxviews.get('lounge@montague.lit');
|
|
|
if (!view.el.querySelectorAll('.chat-area').length) {
|
|
|
view.renderChatArea();
|
|
|
@@ -1481,7 +1481,7 @@
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
const groupchat_jid = 'lounge@montague.lit'
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'montague.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
|
|
|
const view = _converse.chatboxviews.get(groupchat_jid);
|
|
|
const occupants = view.el.querySelector('.occupant-list');
|
|
|
for (let i=0; i<mock.chatroom_names.length; i++) {
|
|
|
@@ -1559,7 +1559,7 @@
|
|
|
null, ['rosterGroupsFetched'], {},
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'montague.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
|
|
|
var name;
|
|
|
var view = _converse.chatboxviews.get('lounge@montague.lit'),
|
|
|
occupants = view.el.querySelector('.occupant-list');
|
|
|
@@ -1617,7 +1617,7 @@
|
|
|
mock.initConverse(null, ['rosterGroupsFetched'], {},
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'montague.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
|
|
|
/* <presence xmlns="jabber:client" to="jc@chat.example.org/converse.js-17184538"
|
|
|
* from="oo@conference.chat.example.org/<img src="x" onerror="alert(123)"/>">
|
|
|
* <x xmlns="http://jabber.org/protocol/muc#user">
|
|
|
@@ -1650,7 +1650,7 @@
|
|
|
null, ['rosterGroupsFetched'], {'view_mode': 'fullscreen'},
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'montague.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
|
|
|
const view = _converse.chatboxviews.get('lounge@montague.lit');
|
|
|
let contact_jid = mock.cur_names[2].replace(/ /g,'.').toLowerCase() + '@montague.lit';
|
|
|
|
|
|
@@ -1749,14 +1749,14 @@
|
|
|
|
|
|
const IQ_stanzas = _converse.connection.IQ_stanzas;
|
|
|
const sendIQ = _converse.connection.sendIQ;
|
|
|
- const room_jid = 'lounge@montague.lit';
|
|
|
+ const muc_jid = 'lounge@montague.lit';
|
|
|
|
|
|
await test_utils.openChatRoom(_converse, 'lounge', 'montague.lit', 'romeo');
|
|
|
|
|
|
let stanza = await test_utils.waitUntil(() => _.filter(
|
|
|
IQ_stanzas,
|
|
|
iq => iq.querySelector(
|
|
|
- `iq[to="${room_jid}"] query[xmlns="http://jabber.org/protocol/disco#info"]`
|
|
|
+ `iq[to="${muc_jid}"] query[xmlns="http://jabber.org/protocol/disco#info"]`
|
|
|
)).pop()
|
|
|
);
|
|
|
// We pretend this is a new room, so no disco info is returned.
|
|
|
@@ -1782,7 +1782,7 @@
|
|
|
*/
|
|
|
const iq = await test_utils.waitUntil(() => _.filter(
|
|
|
IQ_stanzas,
|
|
|
- s => sizzle(`iq[to="${room_jid}"] query[node="x-roomuser-item"]`, s).length
|
|
|
+ s => sizzle(`iq[to="${muc_jid}"] query[node="x-roomuser-item"]`, s).length
|
|
|
).pop()
|
|
|
);
|
|
|
expect(Strophe.serialize(iq)).toBe(
|
|
|
@@ -1858,7 +1858,7 @@
|
|
|
'muc_unmoderated',
|
|
|
'muc_anonymous'
|
|
|
]
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'montague.lit', 'romeo', features);
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo', features);
|
|
|
spyOn(_converse.api, "trigger").and.callThrough();
|
|
|
spyOn(window, 'prompt').and.callFake(() => "Please join!");
|
|
|
const view = _converse.chatboxviews.get('lounge@montague.lit');
|
|
|
@@ -1909,13 +1909,13 @@
|
|
|
|
|
|
test_utils.createContacts(_converse, 'current'); // We need roster contacts, who can invite us
|
|
|
spyOn(window, 'confirm').and.callFake(() => true);
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'montague.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
|
|
|
const view = _converse.chatboxviews.get('lounge@montague.lit');
|
|
|
view.close(); // Hack, otherwise we have to mock stanzas.
|
|
|
|
|
|
const name = mock.cur_names[0];
|
|
|
const from_jid = name.replace(/ /g,'.').toLowerCase() + '@montague.lit';
|
|
|
- const room_jid = 'lounge@montague.lit';
|
|
|
+ const muc_jid = 'lounge@montague.lit';
|
|
|
const reason = "Please join this groupchat";
|
|
|
|
|
|
expect(_converse.chatboxes.models.length).toBe(1);
|
|
|
@@ -1923,15 +1923,15 @@
|
|
|
|
|
|
const stanza = u.toStanza(`
|
|
|
<message xmlns="jabber:client" to="${_converse.bare_jid}" from="${from_jid}" id="9bceb415-f34b-4fa4-80d5-c0d076a24231">
|
|
|
- <x xmlns="jabber:x:conference" jid="${room_jid}" reason="${reason}"/>
|
|
|
+ <x xmlns="jabber:x:conference" jid="${muc_jid}" reason="${reason}"/>
|
|
|
</message>`);
|
|
|
_converse.onDirectMUCInvitation(stanza);
|
|
|
expect(window.confirm).toHaveBeenCalledWith(
|
|
|
- name + ' has invited you to join a groupchat: '+ room_jid +
|
|
|
+ name + ' has invited you to join a groupchat: '+ muc_jid +
|
|
|
', and left the following reason: "'+reason+'"');
|
|
|
expect(_converse.chatboxes.models.length).toBe(2);
|
|
|
expect(_converse.chatboxes.models[0].id).toBe('controlbox');
|
|
|
- expect(_converse.chatboxes.models[1].id).toBe(room_jid);
|
|
|
+ expect(_converse.chatboxes.models[1].id).toBe(muc_jid);
|
|
|
done();
|
|
|
}));
|
|
|
|
|
|
@@ -1941,7 +1941,7 @@
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
const text = 'This is a received message';
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'montague.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
|
|
|
spyOn(_converse.api, "trigger");
|
|
|
const view = _converse.chatboxviews.get('lounge@montague.lit');
|
|
|
if (!view.el.querySelectorAll('.chat-area').length) {
|
|
|
@@ -1973,7 +1973,7 @@
|
|
|
null, ['rosterGroupsFetched'], {},
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'montague.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
|
|
|
spyOn(_converse.api, "trigger");
|
|
|
const view = _converse.chatboxviews.get('lounge@montague.lit');
|
|
|
if (!view.el.querySelectorAll('.chat-area').length) {
|
|
|
@@ -2021,7 +2021,7 @@
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
var message = 'This message is received while the chat area is scrolled up';
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'montague.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
|
|
|
var view = _converse.chatboxviews.get('lounge@montague.lit');
|
|
|
spyOn(view, 'scrollDown').and.callThrough();
|
|
|
// Create enough messages so that there's a scrollbar.
|
|
|
@@ -2063,7 +2063,7 @@
|
|
|
null, ['rosterGroupsFetched'], {},
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'jdev', 'conference.jabber.org', 'jc');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'jdev@conference.jabber.org', 'jc');
|
|
|
const text = 'Jabber/XMPP Development | RFCs and Extensions: https://xmpp.org/ | Protocol and XSF discussions: xsf@muc.xmpp.org';
|
|
|
let stanza = u.toStanza(`
|
|
|
<message xmlns="jabber:client" to="jc@opkode.com/_converse.js-60429116" type="groupchat" from="jdev@conference.jabber.org/ralphm">
|
|
|
@@ -2101,7 +2101,7 @@
|
|
|
null, ['rosterGroupsFetched'], {},
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'jdev', 'conference.jabber.org', 'jc');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'jdev@conference.jabber.org', 'jc');
|
|
|
spyOn(window, 'alert');
|
|
|
const subject = '<img src="x" onerror="alert(\'XSS\');"/>';
|
|
|
const view = _converse.chatboxviews.get('jdev@conference.jabber.org');
|
|
|
@@ -2122,7 +2122,7 @@
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
const groupchat_jid = 'coven@chat.shakespeare.lit';
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'coven', 'chat.shakespeare.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'coven@chat.shakespeare.lit', 'romeo');
|
|
|
const view = _converse.chatboxviews.get(groupchat_jid);
|
|
|
expect(view.model.get('connection_status')).toBe(converse.ROOMSTATUS.ENTERED);
|
|
|
await test_utils.sendMessage(view, 'hello world');
|
|
|
@@ -2176,7 +2176,7 @@
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
const groupchat_jid = 'coven@chat.shakespeare.lit';
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'coven', 'chat.shakespeare.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'coven@chat.shakespeare.lit', 'romeo');
|
|
|
const view = _converse.chatboxviews.get(groupchat_jid);
|
|
|
expect(view.model.get('connection_status')).toBe(converse.ROOMSTATUS.ENTERED);
|
|
|
|
|
|
@@ -2239,7 +2239,7 @@
|
|
|
* </presence>
|
|
|
*/
|
|
|
const __ = _converse.__;
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'montague.lit', 'oldnick');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'oldnick');
|
|
|
const view = _converse.chatboxviews.get('lounge@montague.lit');
|
|
|
expect(view.model.get('connection_status')).toBe(converse.ROOMSTATUS.ENTERED);
|
|
|
const chat_content = view.el.querySelector('.chat-content');
|
|
|
@@ -2315,18 +2315,18 @@
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
const IQ_stanzas = _converse.connection.IQ_stanzas;
|
|
|
- const room_jid = 'coven@chat.shakespeare.lit';
|
|
|
+ const muc_jid = 'coven@chat.shakespeare.lit';
|
|
|
|
|
|
- await _converse.api.rooms.open(room_jid, {'nick': 'some1'});
|
|
|
+ await _converse.api.rooms.open(muc_jid, {'nick': 'some1'});
|
|
|
const stanza = await test_utils.waitUntil(() => _.filter(
|
|
|
IQ_stanzas,
|
|
|
iq => iq.querySelector(
|
|
|
- `iq[to="${room_jid}"] query[xmlns="http://jabber.org/protocol/disco#info"]`
|
|
|
+ `iq[to="${muc_jid}"] query[xmlns="http://jabber.org/protocol/disco#info"]`
|
|
|
)).pop());
|
|
|
|
|
|
// Check that the groupchat queried for the feautures.
|
|
|
expect(Strophe.serialize(stanza)).toBe(
|
|
|
- `<iq from="romeo@montague.lit/orchard" id="${stanza.getAttribute("id")}" to="${room_jid}" type="get" xmlns="jabber:client">`+
|
|
|
+ `<iq from="romeo@montague.lit/orchard" id="${stanza.getAttribute("id")}" to="${muc_jid}" type="get" xmlns="jabber:client">`+
|
|
|
`<query xmlns="http://jabber.org/protocol/disco#info"/>`+
|
|
|
`</iq>`);
|
|
|
|
|
|
@@ -2350,7 +2350,7 @@
|
|
|
* </iq>
|
|
|
*/
|
|
|
const features_stanza = $iq({
|
|
|
- 'from': room_jid,
|
|
|
+ 'from': muc_jid,
|
|
|
'id': stanza.getAttribute('id'),
|
|
|
'to': 'romeo@montague.lit/desktop',
|
|
|
'type': 'result'
|
|
|
@@ -2397,7 +2397,7 @@
|
|
|
'muc_unmoderated',
|
|
|
'muc_nonanonymous'
|
|
|
];
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'room', 'conference.example.org', 'romeo', features);
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'room@conference.example.org', 'romeo', features);
|
|
|
const jid = 'room@conference.example.org';
|
|
|
const chatroomview = _converse.chatboxviews.get(jid);
|
|
|
let features_list = chatroomview.el.querySelector('.features-list');
|
|
|
@@ -2578,7 +2578,7 @@
|
|
|
let sent_IQ, IQ_id;
|
|
|
const sendIQ = _converse.connection.sendIQ;
|
|
|
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'coven', 'chat.shakespeare.lit', 'some1');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'coven@chat.shakespeare.lit', 'some1');
|
|
|
spyOn(_converse.connection, 'sendIQ').and.callFake(function (iq, callback, errback) {
|
|
|
sent_IQ = iq;
|
|
|
IQ_id = sendIQ.bind(this)(iq, callback, errback);
|
|
|
@@ -2639,7 +2639,7 @@
|
|
|
* </x>
|
|
|
* </presence>
|
|
|
*/
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'montague.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
|
|
|
var presence = $pres().attrs({
|
|
|
from:'lounge@montague.lit/romeo',
|
|
|
to:'romeo@montague.lit/pda',
|
|
|
@@ -2765,7 +2765,7 @@
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
spyOn(window, 'confirm').and.callFake(() => true);
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'montague.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
|
|
|
const view = _converse.chatboxviews.get('lounge@montague.lit');
|
|
|
const textarea = view.el.querySelector('.chat-textarea');
|
|
|
textarea.value = '/clear';
|
|
|
@@ -2838,7 +2838,7 @@
|
|
|
null, ['rosterGroupsFetched'], {muc_disable_slash_commands: ['mute', 'voice']},
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'montague.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
|
|
|
const view = _converse.chatboxviews.get('lounge@montague.lit');
|
|
|
var textarea = view.el.querySelector('.chat-textarea');
|
|
|
const enter = { 'target': textarea, 'preventDefault': _.noop, 'keyCode': 13 };
|
|
|
@@ -2876,7 +2876,7 @@
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
let iq_stanza;
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'muc.montague.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'lounge@muc.montague.lit', 'romeo');
|
|
|
const view = _converse.chatboxviews.get('lounge@muc.montague.lit');
|
|
|
/* We don't show join/leave messages for existing occupants. We
|
|
|
* know about them because we receive their presences before we
|
|
|
@@ -3020,7 +3020,7 @@
|
|
|
null, ['rosterGroupsFetched'], {},
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'montague.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
|
|
|
const view = _converse.chatboxviews.get('lounge@montague.lit');
|
|
|
spyOn(view, 'clearMessages');
|
|
|
let sent_stanza;
|
|
|
@@ -3072,7 +3072,7 @@
|
|
|
null, ['rosterGroupsFetched'], {},
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'montague.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
|
|
|
const view = _converse.chatboxviews.get('lounge@montague.lit');
|
|
|
spyOn(view, 'clearMessages');
|
|
|
const textarea = view.el.querySelector('.chat-textarea')
|
|
|
@@ -3098,7 +3098,7 @@
|
|
|
IQ_id = sendIQ.bind(this)(iq, callback, errback);
|
|
|
});
|
|
|
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'montague.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
|
|
|
const view = _converse.chatboxviews.get('lounge@montague.lit');
|
|
|
spyOn(view.model, 'setAffiliation').and.callThrough();
|
|
|
spyOn(view, 'showErrorMessage').and.callThrough();
|
|
|
@@ -3186,7 +3186,7 @@
|
|
|
IQ_id = sendIQ.bind(this)(iq, callback, errback);
|
|
|
});
|
|
|
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'montague.lit', 'romeo');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo');
|
|
|
const view = _converse.chatboxviews.get('lounge@montague.lit');
|
|
|
spyOn(view.model, 'setAffiliation').and.callThrough();
|
|
|
spyOn(view, 'showErrorMessage').and.callThrough();
|
|
|
@@ -3286,8 +3286,9 @@
|
|
|
IQ_id = sendIQ.bind(this)(iq, callback, errback);
|
|
|
});
|
|
|
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'montague.lit', 'romeo');
|
|
|
- const view = _converse.chatboxviews.get('lounge@montague.lit');
|
|
|
+ const muc_jid = 'lounge@montague.lit';
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
|
|
|
+ const view = _converse.api.chatviews.get(muc_jid);
|
|
|
spyOn(view.model, 'setRole').and.callThrough();
|
|
|
spyOn(view, 'showErrorMessage').and.callThrough();
|
|
|
spyOn(view, 'validateRoleOrAffiliationChangeArgs').and.callThrough();
|
|
|
@@ -3370,14 +3371,15 @@
|
|
|
null, ['rosterGroupsFetched'], {},
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'montague.lit', 'romeo');
|
|
|
+ const muc_jid = 'lounge@montague.lit';
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
|
|
|
+ const view = _converse.api.chatviews.get(muc_jid);
|
|
|
var sent_IQ, IQ_id;
|
|
|
var sendIQ = _converse.connection.sendIQ;
|
|
|
spyOn(_converse.connection, 'sendIQ').and.callFake(function (iq, callback, errback) {
|
|
|
sent_IQ = iq;
|
|
|
IQ_id = sendIQ.bind(this)(iq, callback, errback);
|
|
|
});
|
|
|
- const view = _converse.chatboxviews.get('lounge@montague.lit');
|
|
|
spyOn(view.model, 'setRole').and.callThrough();
|
|
|
spyOn(view, 'showErrorMessage').and.callThrough();
|
|
|
spyOn(view, 'showChatEvent').and.callThrough();
|
|
|
@@ -3512,14 +3514,15 @@
|
|
|
null, ['rosterGroupsFetched'], {},
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'montague.lit', 'romeo');
|
|
|
+ const muc_jid = 'lounge@montague.lit';
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
|
|
|
+ const view = _converse.api.chatviews.get(muc_jid);
|
|
|
var sent_IQ, IQ_id;
|
|
|
var sendIQ = _converse.connection.sendIQ;
|
|
|
spyOn(_converse.connection, 'sendIQ').and.callFake(function (iq, callback, errback) {
|
|
|
sent_IQ = iq;
|
|
|
IQ_id = sendIQ.bind(this)(iq, callback, errback);
|
|
|
});
|
|
|
- var view = _converse.chatboxviews.get('lounge@montague.lit');
|
|
|
spyOn(view.model, 'setRole').and.callThrough();
|
|
|
spyOn(view, 'showErrorMessage').and.callThrough();
|
|
|
spyOn(view, 'showChatEvent').and.callThrough();
|
|
|
@@ -3655,14 +3658,15 @@
|
|
|
null, ['rosterGroupsFetched'], {},
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'montague.lit', 'romeo');
|
|
|
+ const muc_jid = 'lounge@montague.lit';
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, muc_jid, 'romeo');
|
|
|
+ const view = _converse.api.chatviews.get(muc_jid);
|
|
|
let sent_IQ, IQ_id;
|
|
|
const sendIQ = _converse.connection.sendIQ;
|
|
|
spyOn(_converse.connection, 'sendIQ').and.callFake(function (iq, callback, errback) {
|
|
|
sent_IQ = iq;
|
|
|
IQ_id = sendIQ.bind(this)(iq, callback, errback);
|
|
|
});
|
|
|
- const view = _converse.chatboxviews.get('lounge@montague.lit');
|
|
|
const textarea = view.el.querySelector('.chat-textarea');
|
|
|
textarea.value = '/destroy bored';
|
|
|
view.onFormSubmitted(new Event('submit'));
|
|
|
@@ -4111,21 +4115,21 @@
|
|
|
var sent_IQs = [], IQ_ids = [];
|
|
|
const sendIQ = _converse.connection.sendIQ;
|
|
|
const IQ_stanzas = _converse.connection.IQ_stanzas;
|
|
|
- const room_jid = 'coven@chat.shakespeare.lit';
|
|
|
+ const muc_jid = 'coven@chat.shakespeare.lit';
|
|
|
spyOn(_converse.connection, 'sendIQ').and.callFake(function (iq, callback, errback) {
|
|
|
sent_IQs.push(iq);
|
|
|
IQ_ids.push(sendIQ.bind(this)(iq, callback, errback));
|
|
|
});
|
|
|
|
|
|
- await _converse.api.rooms.open(room_jid, {'nick': 'romeo'});
|
|
|
+ await _converse.api.rooms.open(muc_jid, {'nick': 'romeo'});
|
|
|
let stanza = await test_utils.waitUntil(() => _.filter(
|
|
|
IQ_stanzas,
|
|
|
iq => iq.querySelector(
|
|
|
- `iq[to="${room_jid}"] query[xmlns="http://jabber.org/protocol/disco#info"]`
|
|
|
+ `iq[to="${muc_jid}"] query[xmlns="http://jabber.org/protocol/disco#info"]`
|
|
|
)).pop());
|
|
|
// Check that the groupchat queried for the feautures.
|
|
|
expect(Strophe.serialize(stanza)).toBe(
|
|
|
- `<iq from="romeo@montague.lit/orchard" id="${stanza.getAttribute("id")}" to="${room_jid}" type="get" xmlns="jabber:client">`+
|
|
|
+ `<iq from="romeo@montague.lit/orchard" id="${stanza.getAttribute("id")}" to="${muc_jid}" type="get" xmlns="jabber:client">`+
|
|
|
`<query xmlns="http://jabber.org/protocol/disco#info"/>`+
|
|
|
`</iq>`);
|
|
|
|
|
|
@@ -4246,7 +4250,7 @@
|
|
|
stanza = await test_utils.waitUntil(() => _.filter(
|
|
|
IQ_stanzas,
|
|
|
iq => iq.querySelector(
|
|
|
- `iq[to="${room_jid}"] query[xmlns="http://jabber.org/protocol/muc#admin"]`
|
|
|
+ `iq[to="${muc_jid}"] query[xmlns="http://jabber.org/protocol/muc#admin"]`
|
|
|
)).pop());
|
|
|
expect(stanza.outerHTML,
|
|
|
`<iq id="${IQ_ids.pop()}" to="coven@chat.shakespeare.lit" type="set" xmlns="jabber:client">`+
|
|
|
@@ -4671,20 +4675,20 @@
|
|
|
const roomspanel = _converse.chatboxviews.get('controlbox').roomspanel;
|
|
|
expect(roomspanel.el.querySelectorAll('.available-room').length).toBe(0);
|
|
|
|
|
|
- const room_jid = 'kitchen@conference.shakespeare.lit';
|
|
|
+ const muc_jid = 'kitchen@conference.shakespeare.lit';
|
|
|
const message = 'fires: Your attention is required';
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'kitchen', 'conference.shakespeare.lit', 'fires');
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, muc_jid, 'fires');
|
|
|
+ const view = _converse.api.chatviews.get(muc_jid);
|
|
|
expect(roomspanel.el.querySelectorAll('.available-room').length).toBe(1);
|
|
|
expect(roomspanel.el.querySelectorAll('.msgs-indicator').length).toBe(0);
|
|
|
|
|
|
- const view = _converse.chatboxviews.get(room_jid);
|
|
|
view.model.set({'minimized': true});
|
|
|
|
|
|
const contact_jid = mock.cur_names[5].replace(/ /g,'.').toLowerCase() + '@montague.lit';
|
|
|
const nick = mock.chatroom_names[0];
|
|
|
|
|
|
await view.model.onMessage($msg({
|
|
|
- from: room_jid+'/'+nick,
|
|
|
+ from: muc_jid+'/'+nick,
|
|
|
id: (new Date()).getTime(),
|
|
|
to: 'romeo@montague.lit',
|
|
|
type: 'groupchat'
|
|
|
@@ -4695,7 +4699,7 @@
|
|
|
expect(roomspanel.el.querySelector('.msgs-indicator').textContent).toBe('1');
|
|
|
|
|
|
await view.model.onMessage($msg({
|
|
|
- 'from': room_jid+'/'+nick,
|
|
|
+ 'from': muc_jid+'/'+nick,
|
|
|
'id': (new Date()).getTime(),
|
|
|
'to': 'romeo@montague.lit',
|
|
|
'type': 'groupchat'
|
|
|
@@ -4720,9 +4724,9 @@
|
|
|
null, ['rosterGroupsFetched'], {},
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
- const room_jid = 'coven@chat.shakespeare.lit';
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'coven', 'chat.shakespeare.lit', 'some1');
|
|
|
- const view = _converse.chatboxviews.get('coven@chat.shakespeare.lit');
|
|
|
+ const muc_jid = 'coven@chat.shakespeare.lit';
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, muc_jid, 'some1');
|
|
|
+ const view = _converse.api.chatviews.get(muc_jid);
|
|
|
const chat_content = view.el.querySelector('.chat-content');
|
|
|
|
|
|
expect(sizzle('div.chat-info:first', chat_content).pop().textContent)
|
|
|
@@ -4762,7 +4766,7 @@
|
|
|
|
|
|
// <composing> state
|
|
|
let msg = $msg({
|
|
|
- from: room_jid+'/newguy',
|
|
|
+ from: muc_jid+'/newguy',
|
|
|
id: (new Date()).getTime(),
|
|
|
to: 'romeo@montague.lit',
|
|
|
type: 'groupchat'
|
|
|
@@ -4787,7 +4791,7 @@
|
|
|
|
|
|
// Check that it doesn't appear twice
|
|
|
msg = $msg({
|
|
|
- from: room_jid+'/newguy',
|
|
|
+ from: muc_jid+'/newguy',
|
|
|
id: (new Date()).getTime(),
|
|
|
to: 'romeo@montague.lit',
|
|
|
type: 'groupchat'
|
|
|
@@ -4807,7 +4811,7 @@
|
|
|
|
|
|
// <composing> state for a different occupant
|
|
|
msg = $msg({
|
|
|
- from: room_jid+'/nomorenicks',
|
|
|
+ from: muc_jid+'/nomorenicks',
|
|
|
id: (new Date()).getTime(),
|
|
|
to: 'romeo@montague.lit',
|
|
|
type: 'groupchat'
|
|
|
@@ -4827,7 +4831,7 @@
|
|
|
|
|
|
// Check that new messages appear under the chat state notifications
|
|
|
msg = $msg({
|
|
|
- from: `${room_jid}/some1`,
|
|
|
+ from: `${muc_jid}/some1`,
|
|
|
id: (new Date()).getTime(),
|
|
|
to: 'romeo@montague.lit',
|
|
|
type: 'groupchat'
|
|
|
@@ -4872,7 +4876,7 @@
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
await test_utils.openChatRoom(_converse, "coven", 'chat.shakespeare.lit', 'some1');
|
|
|
- const room_jid = 'coven@chat.shakespeare.lit';
|
|
|
+ const muc_jid = 'coven@chat.shakespeare.lit';
|
|
|
const view = _converse.chatboxviews.get('coven@chat.shakespeare.lit');
|
|
|
const chat_content = view.el.querySelector('.chat-content');
|
|
|
|
|
|
@@ -4932,7 +4936,7 @@
|
|
|
|
|
|
// <composing> state
|
|
|
var msg = $msg({
|
|
|
- from: room_jid+'/newguy',
|
|
|
+ from: muc_jid+'/newguy',
|
|
|
id: (new Date()).getTime(),
|
|
|
to: 'romeo@montague.lit',
|
|
|
type: 'groupchat'
|
|
|
@@ -4953,7 +4957,7 @@
|
|
|
|
|
|
// Check that it doesn't appear twice
|
|
|
msg = $msg({
|
|
|
- from: room_jid+'/newguy',
|
|
|
+ from: muc_jid+'/newguy',
|
|
|
id: (new Date()).getTime(),
|
|
|
to: 'romeo@montague.lit',
|
|
|
type: 'groupchat'
|
|
|
@@ -4972,7 +4976,7 @@
|
|
|
|
|
|
// <composing> state for a different occupant
|
|
|
msg = $msg({
|
|
|
- from: room_jid+'/nomorenicks',
|
|
|
+ from: muc_jid+'/nomorenicks',
|
|
|
id: (new Date()).getTime(),
|
|
|
to: 'romeo@montague.lit',
|
|
|
type: 'groupchat'
|
|
|
@@ -4995,7 +4999,7 @@
|
|
|
|
|
|
// <paused> state from occupant who typed first
|
|
|
msg = $msg({
|
|
|
- from: room_jid+'/newguy',
|
|
|
+ from: muc_jid+'/newguy',
|
|
|
id: (new Date()).getTime(),
|
|
|
to: 'romeo@montague.lit',
|
|
|
type: 'groupchat'
|
|
|
@@ -5029,8 +5033,9 @@
|
|
|
null, ['rosterGroupsFetched', 'chatBoxesFetched'], {},
|
|
|
async function (done, _converse) {
|
|
|
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'trollbox', 'montague.lit', 'troll');
|
|
|
- const view = _converse.chatboxviews.get('trollbox@montague.lit');
|
|
|
+ const muc_jid = 'trollbox@montague.lit';
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, muc_jid, 'troll');
|
|
|
+ const view = _converse.api.chatviews.get(muc_jid);
|
|
|
const textarea = view.el.querySelector('.chat-textarea');
|
|
|
textarea.value = 'Hello world';
|
|
|
view.onFormSubmitted(new Event('submit'));
|
|
|
@@ -5058,8 +5063,9 @@
|
|
|
Strophe.NS.SID,
|
|
|
'muc_moderated',
|
|
|
]
|
|
|
- await test_utils.openAndEnterChatRoom(_converse, 'trollbox', 'montague.lit', 'troll', features);
|
|
|
- const view = _converse.chatboxviews.get('trollbox@montague.lit');
|
|
|
+ const muc_jid = 'trollbox@montague.lit';
|
|
|
+ await test_utils.openAndEnterChatRoom(_converse, muc_jid, 'troll', features);
|
|
|
+ const view = _converse.api.chatviews.get(muc_jid);
|
|
|
expect(_.isNull(view.el.querySelector('.chat-textarea'))).toBe(false);
|
|
|
|
|
|
let stanza = u.toStanza(`
|
JC Brand