Remove reference to view.el in tests

spec/chatbox.js

@@ -23,8 +23,8 @@ describe("Chatboxes", function () {
             const view = _converse.chatboxviews.get(contact_jid);
             mock.sendMessage(view, '/help');
 
-            await u.waitUntil(() => sizzle('.chat-info:not(.chat-date)', view.el).length);
-            const info_messages = await u.waitUntil(() => sizzle('.chat-info:not(.chat-date)', view.el));
+            await u.waitUntil(() => sizzle('.chat-info:not(.chat-date)', view).length);
+            const info_messages = await u.waitUntil(() => sizzle('.chat-info:not(.chat-date)', view));
             expect(info_messages.length).toBe(4);
             expect(info_messages.pop().textContent).toBe('/help: Show this menu');
             expect(info_messages.pop().textContent).toBe('/me: Write in the third person');
@@ -56,7 +56,7 @@ describe("Chatboxes", function () {
             for (const i of Array(10).keys()) {
                 mock.sendMessage(view, `Message ${i}`);
             }
-            await u.waitUntil(() => sizzle('converse-chat-message', view.el).length === 10);
+            await u.waitUntil(() => sizzle('converse-chat-message', view).length === 10);
 
             const textarea = view.querySelector('textarea.chat-textarea');
             textarea.value = '/clear';
@@ -66,7 +66,7 @@ describe("Chatboxes", function () {
                 keyCode: 13 // Enter
             });
             expect(window.confirm).toHaveBeenCalled();
-            await u.waitUntil(() => sizzle('converse-chat-message', view.el).length === 0);
+            await u.waitUntil(() => sizzle('converse-chat-message', view).length === 0);
             done();
         }));
 
@@ -149,7 +149,7 @@ describe("Chatboxes", function () {
             spyOn(_converse.ChatBoxView.prototype, 'focus').and.callThrough();
             const view = await mock.openChatBoxFor(_converse, contact_jid);
             const rosterview = document.querySelector('converse-roster');
-            const el = sizzle('a.open-chat:contains("'+view.model.getDisplayName()+'")', rosterview.el).pop();
+            const el = sizzle('a.open-chat:contains("'+view.model.getDisplayName()+'")', rosterview).pop();
             await u.waitUntil(() => u.isVisible(el));
             const textarea = view.querySelector('.chat-textarea');
             await u.waitUntil(() => u.isVisible(textarea));
@@ -1104,12 +1104,12 @@ describe("Chatboxes", function () {
             await _converse.handleMessageStanza(msg);
             await u.waitUntil(() => chatbox.messages.length);
             const selector = 'a.open-chat:contains("' + chatbox.get('nickname') + '") .msgs-indicator';
-            indicator_el = sizzle(selector, rosterview.el).pop();
+            indicator_el = sizzle(selector, rosterview).pop();
             expect(indicator_el.textContent).toBe('1');
             msg = mock.createChatMessage(_converse, sender_jid, 'This message will be unread too');
             await _converse.handleMessageStanza(msg);
             await u.waitUntil(() => chatbox.messages.length > 1);
-            indicator_el = sizzle(selector, rosterview.el).pop();
+            indicator_el = sizzle(selector, rosterview).pop();
             expect(indicator_el.textContent).toBe('2');
             done();
         }));
@@ -1131,13 +1131,13 @@ describe("Chatboxes", function () {
             await _converse.handleMessageStanza(msg);
             await u.waitUntil(() => chatbox.messages.length);
             const selector = 'a.open-chat:contains("' + chatbox.get('nickname') + '") .msgs-indicator';
-            indicator_el = sizzle(selector, rosterview.el).pop();
+            indicator_el = sizzle(selector, rosterview).pop();
             expect(indicator_el.textContent).toBe('1');
 
             msg = mock.createChatMessage(_converse, sender_jid, 'This message will be unread too');
             await _converse.handleMessageStanza(msg);
             await u.waitUntil(() => chatbox.messages.length === 2);
-            indicator_el = sizzle(selector, rosterview.el).pop();
+            indicator_el = sizzle(selector, rosterview).pop();
             expect(indicator_el.textContent).toBe('2');
             done();
         }));
@@ -1154,7 +1154,7 @@ describe("Chatboxes", function () {
             const chatbox = _converse.chatboxes.get(sender_jid);
             const view = _converse.chatboxviews.get(sender_jid);
             const selector = 'a.open-chat:contains("' + chatbox.get('nickname') + '") .msgs-indicator';
-            const select_msgs_indicator = () => sizzle(selector, rosterview.el).pop();
+            const select_msgs_indicator = () => sizzle(selector, rosterview).pop();
             _converse.minimize.minimize(view.model);
             _converse.handleMessageStanza(msgFactory());
             await u.waitUntil(() => chatbox.messages.length);
@@ -1179,7 +1179,7 @@ describe("Chatboxes", function () {
             const chatbox = _converse.chatboxes.get(sender_jid);
             const msgFactory = () => mock.createChatMessage(_converse, sender_jid, 'This message will be received as unread, but eventually will be read');
             const selector = `a.open-chat:contains("${chatbox.get('nickname')}") .msgs-indicator`;
-            const select_msgs_indicator = () => sizzle(selector, rosterview.el).pop();
+            const select_msgs_indicator = () => sizzle(selector, rosterview).pop();
             chatbox.save('scrolled', true);
             _converse.handleMessageStanza(msgFactory());
             const view = _converse.chatboxviews.get(sender_jid);
@@ -1204,7 +1204,7 @@ describe("Chatboxes", function () {
             const msg = 'This message will be received as unread, but eventually will be read';
             const msgFactory = () => mock.createChatMessage(_converse, sender_jid, msg);
             const selector = 'a.open-chat:contains("' + chatbox.get('nickname') + '") .msgs-indicator';
-            const select_msgs_indicator = () => sizzle(selector, rosterview.el).pop();
+            const select_msgs_indicator = () => sizzle(selector, rosterview).pop();
             chatbox.save('scrolled', true);
             _converse.handleMessageStanza(msgFactory());
             await u.waitUntil(() => view.model.messages.length);

spec/corrections.js

@@ -125,7 +125,7 @@ describe("A Chat Message", function () {
         await u.waitUntil(() => view.model.messages.at(2).get('correcting') === true);
         expect(view.model.messages.at(0).get('correcting')).toBeFalsy();
         expect(view.model.messages.at(1).get('correcting')).toBeFalsy();
-        await u.waitUntil(() => u.hasClass('correcting', sizzle('.chat-msg:last', view.el).pop()), 750);
+        await u.waitUntil(() => u.hasClass('correcting', sizzle('.chat-msg:last', view).pop()), 750);
 
         textarea.selectionEnd = 0; // Happens by pressing up,
                                 // but for some reason not in tests, so we set it manually.
@@ -137,7 +137,7 @@ describe("A Chat Message", function () {
         expect(view.model.messages.at(0).get('correcting')).toBeFalsy();
         expect(view.model.messages.at(1).get('correcting')).toBe(true);
         expect(view.model.messages.at(2).get('correcting')).toBeFalsy();
-        await u.waitUntil(() => u.hasClass('correcting', sizzle('.chat-msg', view.el)[1]), 500);
+        await u.waitUntil(() => u.hasClass('correcting', sizzle('.chat-msg', view)[1]), 500);
 
         textarea.value = 'It is the east, and Juliet is the sun.';
         view.onKeyDown({

spec/messages.js

@@ -511,7 +511,7 @@ describe("A Chat Message", function () {
         spyOn(view.model, 'sendMessage').and.callThrough();
         await mock.sendMessage(view, message);
         expect(view.model.sendMessage).toHaveBeenCalled();
-        const msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+        const msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
         expect(msg.textContent).toEqual(message);
         expect(msg.innerHTML.replace(/<!---->/g, '')).toEqual('&lt;p&gt;This message contains &lt;em&gt;some&lt;/em&gt; &lt;b&gt;markup&lt;/b&gt;&lt;/p&gt;');
         done();
@@ -530,7 +530,7 @@ describe("A Chat Message", function () {
         mock.sendMessage(view, message);
         expect(view.model.sendMessage).toHaveBeenCalled();
         await u.waitUntil(() => view.querySelectorAll('.chat-msg__text').length);
-        const msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+        const msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
         expect(msg.textContent).toEqual(message);
         await u.waitUntil(() => msg.innerHTML.replace(/<!---->/g, '') ===
             'This message contains a hyperlink: <a target="_blank" rel="noopener" href="http://www.opkode.com">www.opkode.com</a>');
@@ -549,7 +549,7 @@ describe("A Chat Message", function () {
         let message = 'This message contains a hyperlink with forbidden query params: https://www.opkode.com/?id=0&utm_content=1&utm_medium=2&s=1';
         mock.sendMessage(view, message);
         await u.waitUntil(() => view.querySelectorAll('.chat-msg__text').length);
-        let msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+        let msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
         await u.waitUntil(() => msg.innerHTML.replace(/<!---->/g, '') ===
             'This message contains a hyperlink with forbidden query params: <a target="_blank" rel="noopener" href="https://www.opkode.com/?id=0">https://www.opkode.com/?id=0</a>');
 
@@ -558,7 +558,7 @@ describe("A Chat Message", function () {
         message = 'Another message with a hyperlink with forbidden query params: https://www.opkode.com/?id=0&utm_content=1&utm_medium=2&s=1';
         mock.sendMessage(view, message);
         await u.waitUntil(() => view.querySelectorAll('.chat-msg__text').length === 2);
-        msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+        msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
         expect(msg.textContent).toEqual('Another message with a hyperlink with forbidden query params: https://www.opkode.com/?id=0&utm_content=1&s=1');
         await u.waitUntil(() => msg.innerHTML.replace(/<!---->/g, '') ===
             'Another message with a hyperlink with forbidden query params: '+
@@ -723,8 +723,8 @@ describe("A Chat Message", function () {
         spyOn(view.model, 'sendMessage').and.callThrough();
         mock.sendMessage(view, message);
         expect(view.model.sendMessage).toHaveBeenCalled();
-        await u.waitUntil(() => view.el.querySelector('.chat-content .chat-msg'), 1000);
-        const msg = view.el.querySelector('.chat-content .chat-msg .chat-msg__text');
+        await u.waitUntil(() => view.querySelector('.chat-content .chat-msg'), 1000);
+        const msg = view.querySelector('.chat-content .chat-msg .chat-msg__text');
         await u.waitUntil(() => msg.innerHTML.replace(/<!---->/g, '').trim() ==
             `<a target="_blank" rel="noopener" href="https://pbs.twimg.com/media/string?format=jpg&amp;name=small">https://pbs.twimg.com/media/string?format=jpg&amp;name=small</a>`, 1000);
         done();
@@ -936,7 +936,7 @@ describe("A Chat Message", function () {
             expect(view.model.sendMessage).toHaveBeenCalled();
             expect(view.model.messages.length, 2);
             expect(_converse.api.trigger.calls.mostRecent().args, ['messageSend', message]);
-            expect(sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop().textContent).toEqual(message);
+            expect(sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop().textContent).toEqual(message);
             done();
         }));
 
@@ -953,7 +953,7 @@ describe("A Chat Message", function () {
             const message = '   \nThis message is sent from this chatbox \n     \n';
             await mock.sendMessage(view, message);
             expect(view.model.messages.at(0).get('message')).toEqual(message.trim());
-            const message_el = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+            const message_el = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
             expect(message_el.textContent).toEqual(message.trim());
             done();
         }));
@@ -1380,7 +1380,7 @@ describe("A Chat Message", function () {
             const view = _converse.chatboxviews.get(sender_jid);
             await u.waitUntil(() => view.model.messages.length);
             expect(_converse.api.chatboxes.create).toHaveBeenCalled();
-            const last_message = await u.waitUntil(() => sizzle('.chat-content:last .chat-msg__text', view.el).pop());
+            const last_message = await u.waitUntil(() => sizzle('.chat-content:last .chat-msg__text', view).pop());
             const msg_txt = last_message.textContent;
             expect(msg_txt).toEqual(message);
             done();

spec/muc_messages.js

@@ -375,7 +375,7 @@ describe("A Groupchat Message", function () {
         expect(view.model.messages.last().occupant.get('affiliation')).toBe('owner');
         expect(view.model.messages.last().occupant.get('role')).toBe('moderator');
         expect(view.querySelectorAll('.chat-msg').length).toBe(1);
-        expect(sizzle('.chat-msg', view.el).pop().classList.value.trim()).toBe('message chat-msg groupchat chat-msg--with-avatar moderator owner');
+        expect(sizzle('.chat-msg', view).pop().classList.value.trim()).toBe('message chat-msg groupchat chat-msg--with-avatar moderator owner');
         let presence = $pres({
                 to:'romeo@montague.lit/orchard',
                 from:'lounge@montague.lit/romeo',
@@ -402,7 +402,7 @@ describe("A Groupchat Message", function () {
         await u.waitUntil(() => view.querySelectorAll('.chat-msg').length === 2);
         expect(view.model.messages.last().occupant.get('affiliation')).toBe('member');
         expect(view.model.messages.last().occupant.get('role')).toBe('participant');
-        expect(sizzle('.chat-msg', view.el).pop().classList.value.trim()).toBe('message chat-msg groupchat chat-msg--with-avatar participant member');
+        expect(sizzle('.chat-msg', view).pop().classList.value.trim()).toBe('message chat-msg groupchat chat-msg--with-avatar participant member');
 
         presence = $pres({
                 to:'romeo@montague.lit/orchard',
@@ -425,7 +425,7 @@ describe("A Groupchat Message", function () {
         expect(occupant.get('affiliation')).toBe('owner');
         expect(occupant.get('role')).toBe('moderator');
         expect(view.querySelectorAll('.chat-msg').length).toBe(3);
-        await u.waitUntil(() => sizzle('.chat-msg', view.el).pop().classList.value.trim() === 'message chat-msg groupchat chat-msg--with-avatar moderator owner');
+        await u.waitUntil(() => sizzle('.chat-msg', view).pop().classList.value.trim() === 'message chat-msg groupchat chat-msg--with-avatar moderator owner');
 
         const add_events = view.model.occupants._events.add.length;
         msg = $msg({

spec/xss.js

@@ -18,44 +18,44 @@ describe("XSS", function () {
 
             let message = "<img src=x onerror=alert('XSS');>";
             await mock.sendMessage(view, message);
-            let msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+            let msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
             expect(msg.textContent).toEqual(message);
             expect(msg.innerHTML.replace(/<!---->/g, '')).toEqual("&lt;img src=x onerror=alert('XSS');&gt;");
             expect(window.alert).not.toHaveBeenCalled();
 
             message = "<img src=x onerror=alert('XSS')//";
             await mock.sendMessage(view, message);
-            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
             expect(msg.textContent).toEqual(message);
             expect(msg.innerHTML.replace(/<!---->/g, '')).toEqual("&lt;img src=x onerror=alert('XSS')//");
 
             message = "<img src=x onerror=alert(String.fromCharCode(88,83,83));>";
             await mock.sendMessage(view, message);
-            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
             expect(msg.textContent).toEqual(message);
             expect(msg.innerHTML.replace(/<!---->/g, '')).toEqual("&lt;img src=x onerror=alert(String.fromCharCode(88,83,83));&gt;");
 
             message = "<img src=x oneonerrorrror=alert(String.fromCharCode(88,83,83));>";
             await mock.sendMessage(view, message);
-            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
             expect(msg.textContent).toEqual(message);
             expect(msg.innerHTML.replace(/<!---->/g, '')).toEqual("&lt;img src=x oneonerrorrror=alert(String.fromCharCode(88,83,83));&gt;");
 
             message = "<img src=x:alert(alt) onerror=eval(src) alt=xss>";
             await mock.sendMessage(view, message);
-            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
             expect(msg.textContent).toEqual(message);
             expect(msg.innerHTML.replace(/<!---->/g, '')).toEqual("&lt;img src=x:alert(alt) onerror=eval(src) alt=xss&gt;");
 
             message = "><img src=x onerror=alert('XSS');>";
             await mock.sendMessage(view, message);
-            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
             expect(msg.textContent).toEqual(message);
             expect(msg.innerHTML.replace(/<!---->/g, '')).toEqual("&gt;&lt;img src=x onerror=alert('XSS');&gt;");
 
             message = "><img src=x onerror=alert(String.fromCharCode(88,83,83));>";
             await mock.sendMessage(view, message);
-            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
             expect(msg.textContent).toEqual(message);
             expect(msg.innerHTML.replace(/<!---->/g, '')).toEqual("&gt;&lt;img src=x onerror=alert(String.fromCharCode(88,83,83));&gt;");
 
@@ -74,43 +74,43 @@ describe("XSS", function () {
 
             let message = "<svgonload=alert(1)>";
             await mock.sendMessage(view, message);
-            let msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+            let msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
             expect(msg.textContent).toEqual(message);
             expect(msg.innerHTML.replace(/<!---->/g, '')).toEqual('&lt;svgonload=alert(1)&gt;');
 
             message = "<svg/onload=alert('XSS')>";
             await mock.sendMessage(view, message);
-            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
             expect(msg.textContent).toEqual(message);
             expect(msg.innerHTML.replace(/<!---->/g, '')).toEqual("&lt;svg/onload=alert('XSS')&gt;");
 
             message = "<svg onload=alert(1)//";
             await mock.sendMessage(view, message);
-            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
             expect(msg.textContent).toEqual(message);
             expect(msg.innerHTML.replace(/<!---->/g, '')).toEqual("&lt;svg onload=alert(1)//");
 
             message = "<svg/onload=alert(String.fromCharCode(88,83,83))>";
             await mock.sendMessage(view, message);
-            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
             expect(msg.textContent).toEqual(message);
             expect(msg.innerHTML.replace(/<!---->/g, '')).toEqual("&lt;svg/onload=alert(String.fromCharCode(88,83,83))&gt;");
 
             message = "<svg id=alert(1) onload=eval(id)>";
             await mock.sendMessage(view, message);
-            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
             expect(msg.textContent).toEqual(message);
             expect(msg.innerHTML.replace(/<!---->/g, '')).toEqual("&lt;svg id=alert(1) onload=eval(id)&gt;");
 
             message = '"><svg/onload=alert(String.fromCharCode(88,83,83))>';
             await mock.sendMessage(view, message);
-            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
             expect(msg.textContent).toEqual(message);
             expect(msg.innerHTML.replace(/<!---->/g, '')).toEqual('"&gt;&lt;svg/onload=alert(String.fromCharCode(88,83,83))&gt;');
 
             message = '"><svg/onload=alert(/XSS/)';
             await mock.sendMessage(view, message);
-            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
             expect(msg.textContent).toEqual(message);
             expect(msg.innerHTML.replace(/<!---->/g, '')).toEqual('"&gt;&lt;svg/onload=alert(/XSS/)');
 
@@ -131,7 +131,7 @@ describe("XSS", function () {
             let message = "http://www.opkode.com/'onmouseover='alert(1)'whatever";
             await mock.sendMessage(view, message);
 
-            let msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+            let msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
             expect(msg.textContent).toEqual(message);
             expect(msg.innerHTML.replace(/<!---->/g, ''))
                 .toEqual('http://www.opkode.com/\'onmouseover=\'alert(1)\'whatever');
@@ -140,34 +140,34 @@ describe("XSS", function () {
 
             message = 'http://www.opkode.com/"onmouseover="alert(1)"whatever';
             await mock.sendMessage(view, message);
-            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
             expect(msg.textContent).toEqual(message);
             await u.waitUntil(() => msg.innerHTML.replace(/<!---->/g, '') ===
                 '<a target="_blank" rel="noopener" href="http://www.opkode.com/%22onmouseover=%22alert%281%29%22whatever">http://www.opkode.com/"onmouseover="alert(1)"whatever</a>');
 
             message = "https://en.wikipedia.org/wiki/Ender's_Game";
             await mock.sendMessage(view, message);
-            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
             expect(msg.textContent).toEqual(message);
             await u.waitUntil(() => msg.innerHTML.replace(/<!---->/g, '') === '<a target="_blank" rel="noopener" href="https://en.wikipedia.org/wiki/Ender%27s_Game">'+message+'</a>');
 
             message = "<https://bugs.documentfoundation.org/show_bug.cgi?id=123737>";
             await mock.sendMessage(view, message);
-            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
             expect(msg.textContent).toEqual(message);
             await u.waitUntil(() => msg.innerHTML.replace(/<!---->/g, '') ===
                 `&lt;<a target="_blank" rel="noopener" href="https://bugs.documentfoundation.org/show_bug.cgi?id=123737">https://bugs.documentfoundation.org/show_bug.cgi?id=123737</a>&gt;`);
 
             message = '<http://www.opkode.com/"onmouseover="alert(1)"whatever>';
             await mock.sendMessage(view, message);
-            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
             expect(msg.textContent).toEqual(message);
             await u.waitUntil(() => msg.innerHTML.replace(/<!---->/g, '') ===
                 '&lt;<a target="_blank" rel="noopener" href="http://www.opkode.com/%22onmouseover=%22alert%281%29%22whatever">http://www.opkode.com/"onmouseover="alert(1)"whatever</a>&gt;');
 
             message = `https://www.google.com/maps/place/Kochstraat+6,+2041+CE+Zandvoort/@52.3775999,4.548971,3a,15y,170.85h,88.39t/data=!3m6!1e1!3m4!1sQ7SdHo_bPLPlLlU8GSGWaQ!2e0!7i13312!8i6656!4m5!3m4!1s0x47c5ec1e56f845ad:0x1de0bc4a5771fb08!8m2!3d52.3773668!4d4.5489388!5m1!1e2`
             await mock.sendMessage(view, message);
-            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+            msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
             expect(msg.textContent).toEqual(message);
             await u.waitUntil(() => msg.innerHTML.replace(/<!---->/g, '') ===
                 `<a target="_blank" rel="noopener" href="https://www.google.com/maps/place/Kochstraat+6,+2041+CE+Zandvoort/@52.3775999,4.548971,3a,15y,170.85h,88.39t/data=%213m6%211e1%213m4%211sQ7SdHo_bPLPlLlU8GSGWaQ%212e0%217i13312%218i6656%214m5%213m4%211s0x47c5ec1e56f845ad:0x1de0bc4a5771fb08%218m2%213d52.3773668%214d4.5489388%215m1%211e2">https://www.google.com/maps/place/Kochstraat+6,+2041+CE+Zandvoort/@52.3775999,4.548971,3a,15y,170.85h,88.39t/data=!3m6!1e1!3m4!1sQ7SdHo_bPLPlLlU8GSGWaQ!2e0!7i13312!8i6656!4m5!3m4!1s0x47c5ec1e56f845ad:0x1de0bc4a5771fb08!8m2!3d52.3773668!4d4.5489388!5m1!1e2</a>`);
@@ -210,19 +210,19 @@ describe("XSS", function () {
             }];
 
             function checkNonParsedURL (url) {
-                const msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+                const msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
                 expect(msg.textContent).toEqual(url);
                 expect(msg.innerHTML.replace(/<!---->/g, '')).toEqual(url);
             }
 
             async function checkParsedURL ({ entered, href }) {
-                const msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+                const msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
                 expect(msg.textContent).toEqual(entered);
                 await u.waitUntil(() => msg.innerHTML.replace(/<!---->/g, '') === `<a target="_blank" rel="noopener" href="${href}">${entered}</a>`);
             }
 
             async function checkParsedXMPPURL ({ entered, href }) {
-                const msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view.el).pop();
+                const msg = sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop();
                 expect(msg.textContent.trim()).toEqual(entered);
                 await u.waitUntil(() => msg.innerHTML.replace(/<!---->/g, '').trim() === `<a target="_blank" rel="noopener" href="${href}">${entered}</a>`);
             }