Skip to content

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

Make sure omemo tests pass on Firefox

parent e05b7e9d
Hide whitespace changes
Inline Side-by-side
Showing with 115 additions and 115 deletions
spec/omemo.js
View file @ defe32d1
...@@ -10,31 +10,31 @@ ...@@ -10,31 +10,31 @@
function deviceListFetched (_converse, jid) { function deviceListFetched (_converse, jid) {
return _.get(_.filter( return _.filter(
_converse.connection.IQ_stanzas, _converse.connection.IQ_stanzas,
iq => iq.nodeTree.querySelector(`iq[to="${jid}"] items[node="eu.siacs.conversations.axolotl.devicelist"]`) iq => iq.nodeTree.querySelector(`iq[to="${jid}"] items[node="eu.siacs.conversations.axolotl.devicelist"]`)
).pop(), 'nodeTree'); ).pop();
} }
function ownDeviceHasBeenPublished (_converse) { function ownDeviceHasBeenPublished (_converse) {
return _.get(_.filter( return _.filter(
_converse.connection.IQ_stanzas, _converse.connection.IQ_stanzas,
iq => iq.nodeTree.querySelector('iq[from="'+_converse.bare_jid+'"] publish[node="eu.siacs.conversations.axolotl.devicelist"]') iq => iq.nodeTree.querySelector('iq[from="'+_converse.bare_jid+'"] publish[node="eu.siacs.conversations.axolotl.devicelist"]')
).pop(), 'nodeTree'); ).pop();
} }
function bundleHasBeenPublished (_converse) { function bundleHasBeenPublished (_converse) {
return _.get(_.filter( return _.filter(
_converse.connection.IQ_stanzas, _converse.connection.IQ_stanzas,
iq => iq.nodeTree.querySelector('publish[node="eu.siacs.conversations.axolotl.bundles:123456789"]') iq => iq.nodeTree.querySelector('publish[node="eu.siacs.conversations.axolotl.bundles:123456789"]')
).pop(), 'nodeTree'); ).pop();
} }
function bundleFetched (_converse, jid, device_id) { function bundleFetched (_converse, jid, device_id) {
return _.get(_.filter( return _.filter(
_converse.connection.IQ_stanzas, _converse.connection.IQ_stanzas,
(iq) => iq.nodeTree.querySelector(`iq[to="${jid}"] items[node="eu.siacs.conversations.axolotl.bundles:${device_id}"]`) (iq) => iq.nodeTree.querySelector(`iq[to="${jid}"] items[node="eu.siacs.conversations.axolotl.bundles:${device_id}"]`)
).pop(), 'nodeTree'); ).pop();
} }
function initializedOMEMO (_converse) { function initializedOMEMO (_converse) {
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
.then(iq_stanza => { .then(iq_stanza => {
const stanza = $iq({ const stanza = $iq({
'from': _converse.bare_jid, 'from': _converse.bare_jid,
'id': iq_stanza.getAttribute('id'), 'id': iq_stanza.nodeTree.getAttribute('id'),
'to': _converse.bare_jid, 'to': _converse.bare_jid,
'type': 'result', 'type': 'result',
}).c('pubsub', {'xmlns': "http://jabber.org/protocol/pubsub"}) }).c('pubsub', {'xmlns': "http://jabber.org/protocol/pubsub"})
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
}).then(iq_stanza => { }).then(iq_stanza => {
const stanza = $iq({ const stanza = $iq({
'from': _converse.bare_jid, 'from': _converse.bare_jid,
'id': iq_stanza.getAttribute('id'), 'id': iq_stanza.nodeTree.getAttribute('id'),
'to': _converse.bare_jid, 'to': _converse.bare_jid,
'type': 'result'}); 'type': 'result'});
_converse.connection._dataRecv(test_utils.createRequest(stanza)); _converse.connection._dataRecv(test_utils.createRequest(stanza));
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
}).then(iq_stanza => { }).then(iq_stanza => {
const stanza = $iq({ const stanza = $iq({
'from': _converse.bare_jid, 'from': _converse.bare_jid,
'id': iq_stanza.getAttribute('id'), 'id': iq_stanza.nodeTree.getAttribute('id'),
'to': _converse.bare_jid, 'to': _converse.bare_jid,
'type': 'result'}); 'type': 'result'});
_converse.connection._dataRecv(test_utils.createRequest(stanza)); _converse.connection._dataRecv(test_utils.createRequest(stanza));
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
.then(iq_stanza => { .then(iq_stanza => {
const stanza = $iq({ const stanza = $iq({
'from': contact_jid, 'from': contact_jid,
'id': iq_stanza.getAttribute('id'), 'id': iq_stanza.nodeTree.getAttribute('id'),
'to': _converse.connection.jid, 'to': _converse.connection.jid,
'type': 'result', 'type': 'result',
}).c('pubsub', {'xmlns': "http://jabber.org/protocol/pubsub"}) }).c('pubsub', {'xmlns': "http://jabber.org/protocol/pubsub"})
...@@ -138,10 +138,10 @@ ...@@ -138,10 +138,10 @@
keyCode: 13 // Enter keyCode: 13 // Enter
}); });
return test_utils.waitUntil(() => bundleFetched(_converse, contact_jid, '555')); return test_utils.waitUntil(() => bundleFetched(_converse, contact_jid, '555'));
}).then((iq_stanza) => { }).then(iq_stanza => {
const stanza = $iq({ const stanza = $iq({
'from': contact_jid, 'from': contact_jid,
'id': iq_stanza.getAttribute('id'), 'id': iq_stanza.nodeTree.getAttribute('id'),
'to': _converse.bare_jid, 'to': _converse.bare_jid,
'type': 'result', 'type': 'result',
}).c('pubsub', { }).c('pubsub', {
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
}).then(iq_stanza => { }).then(iq_stanza => {
const stanza = $iq({ const stanza = $iq({
'from': _converse.bare_jid, 'from': _converse.bare_jid,
'id': iq_stanza.getAttribute('id'), 'id': iq_stanza.nodeTree.getAttribute('id'),
'to': _converse.bare_jid, 'to': _converse.bare_jid,
'type': 'result', 'type': 'result',
}).c('pubsub', { }).c('pubsub', {
...@@ -275,10 +275,10 @@ ...@@ -275,10 +275,10 @@
_converse.connection._dataRecv(test_utils.createRequest(stanza)); _converse.connection._dataRecv(test_utils.createRequest(stanza));
return test_utils.waitUntil(() => _converse.chatboxviews.get(contact_jid)) return test_utils.waitUntil(() => _converse.chatboxviews.get(contact_jid))
}).then(iq_stanza => deviceListFetched(_converse, contact_jid)) }).then(iq_stanza => deviceListFetched(_converse, contact_jid))
.then(iq_stanza => { .then(iq_stanza => {
const stanza = $iq({ const stanza = $iq({
'from': contact_jid, 'from': contact_jid,
'id': iq_stanza.getAttribute('id'), 'id': iq_stanza.nodeTree.getAttribute('id'),
'to': _converse.connection.jid, 'to': _converse.connection.jid,
'type': 'result', 'type': 'result',
}).c('pubsub', {'xmlns': "http://jabber.org/protocol/pubsub"}) }).c('pubsub', {'xmlns': "http://jabber.org/protocol/pubsub"})
...@@ -295,21 +295,21 @@ ...@@ -295,21 +295,21 @@
return test_utils.waitUntil(() => _converse.omemo_store); return test_utils.waitUntil(() => _converse.omemo_store);
}).then(() => test_utils.waitUntil(() => bundleHasBeenPublished(_converse))) }).then(() => test_utils.waitUntil(() => bundleHasBeenPublished(_converse)))
.then(iq_stanza => { .then(iq_stanza => {
expect(iq_stanza.outerHTML).toBe( expect(iq_stanza.toLocaleString()).toBe(
`<iq from="dummy@localhost" type="set" xmlns="jabber:client" id="${iq_stanza.getAttribute('id')}">`+ `<iq from='dummy@localhost' type='set' xmlns='jabber:client' id='${iq_stanza.nodeTree.getAttribute('id')}'>`+
`<pubsub xmlns="http://jabber.org/protocol/pubsub">`+ `<pubsub xmlns='http://jabber.org/protocol/pubsub'>`+
`<publish node="eu.siacs.conversations.axolotl.bundles:123456789">`+ `<publish node='eu.siacs.conversations.axolotl.bundles:123456789'>`+
`<item>`+ `<item>`+
`<bundle xmlns="eu.siacs.conversations.axolotl">`+ `<bundle xmlns='eu.siacs.conversations.axolotl'>`+
`<signedPreKeyPublic signedPreKeyId="0">${btoa('1234')}</signedPreKeyPublic>`+ `<signedPreKeyPublic signedPreKeyId='0'>${btoa('1234')}</signedPreKeyPublic>`+
`<signedPreKeySignature>${btoa('11112222333344445555')}</signedPreKeySignature>`+ `<signedPreKeySignature>${btoa('11112222333344445555')}</signedPreKeySignature>`+
`<identityKey>${btoa('1234')}</identityKey>`+ `<identityKey>${btoa('1234')}</identityKey>`+
`<prekeys>`+ `<prekeys>`+
`<preKeyPublic preKeyId="0">${btoa('1234')}</preKeyPublic>`+ `<preKeyPublic preKeyId='0'>${btoa('1234')}</preKeyPublic>`+
`<preKeyPublic preKeyId="1">${btoa('1234')}</preKeyPublic>`+ `<preKeyPublic preKeyId='1'>${btoa('1234')}</preKeyPublic>`+
`<preKeyPublic preKeyId="2">${btoa('1234')}</preKeyPublic>`+ `<preKeyPublic preKeyId='2'>${btoa('1234')}</preKeyPublic>`+
`<preKeyPublic preKeyId="3">${btoa('1234')}</preKeyPublic>`+ `<preKeyPublic preKeyId='3'>${btoa('1234')}</preKeyPublic>`+
`<preKeyPublic preKeyId="4">${btoa('1234')}</preKeyPublic>`+ `<preKeyPublic preKeyId='4'>${btoa('1234')}</preKeyPublic>`+
`</prekeys>`+ `</prekeys>`+
`</bundle>`+ `</bundle>`+
`</item>`+ `</item>`+
...@@ -335,16 +335,16 @@ ...@@ -335,16 +335,16 @@
// Wait until own devices are fetched // Wait until own devices are fetched
test_utils.waitUntil(() => deviceListFetched(_converse, _converse.bare_jid)) test_utils.waitUntil(() => deviceListFetched(_converse, _converse.bare_jid))
.then(iq_stanza => { .then(iq_stanza => {
expect(iq_stanza.outerHTML).toBe( expect(iq_stanza.toLocaleString()).toBe(
'<iq type="get" from="dummy@localhost" to="dummy@localhost" xmlns="jabber:client" id="'+iq_stanza.getAttribute("id")+'">'+ `<iq type='get' from='dummy@localhost' to='dummy@localhost' xmlns='jabber:client' id='${iq_stanza.nodeTree.getAttribute('id')}'>`+
'<pubsub xmlns="http://jabber.org/protocol/pubsub">'+ `<pubsub xmlns='http://jabber.org/protocol/pubsub'>`+
'<items node="eu.siacs.conversations.axolotl.devicelist"/>'+ `<items node='eu.siacs.conversations.axolotl.devicelist'/>`+
'</pubsub>'+ `</pubsub>`+
'</iq>'); `</iq>`);
const stanza = $iq({ const stanza = $iq({
'from': _converse.bare_jid, 'from': _converse.bare_jid,
'id': iq_stanza.getAttribute('id'), 'id': iq_stanza.nodeTree.getAttribute('id'),
'to': _converse.bare_jid, 'to': _converse.bare_jid,
'type': 'result', 'type': 'result',
}).c('pubsub', {'xmlns': "http://jabber.org/protocol/pubsub"}) }).c('pubsub', {'xmlns': "http://jabber.org/protocol/pubsub"})
...@@ -364,7 +364,7 @@ ...@@ -364,7 +364,7 @@
}).then(iq_stanza => { }).then(iq_stanza => {
const stanza = $iq({ const stanza = $iq({
'from': _converse.bare_jid, 'from': _converse.bare_jid,
'id': iq_stanza.getAttribute('id'), 'id': iq_stanza.nodeTree.getAttribute('id'),
'to': _converse.bare_jid, 'to': _converse.bare_jid,
'type': 'result'}); 'type': 'result'});
_converse.connection._dataRecv(test_utils.createRequest(stanza)); _converse.connection._dataRecv(test_utils.createRequest(stanza));
...@@ -372,7 +372,7 @@ ...@@ -372,7 +372,7 @@
}).then(iq_stanza => { }).then(iq_stanza => {
const stanza = $iq({ const stanza = $iq({
'from': _converse.bare_jid, 'from': _converse.bare_jid,
'id': iq_stanza.getAttribute('id'), 'id': iq_stanza.nodeTree.getAttribute('id'),
'to': _converse.bare_jid, 'to': _converse.bare_jid,
'type': 'result'}); 'type': 'result'});
_converse.connection._dataRecv(test_utils.createRequest(stanza)); _converse.connection._dataRecv(test_utils.createRequest(stanza));
...@@ -452,19 +452,19 @@ ...@@ -452,19 +452,19 @@
}).then(iq_stanza => { }).then(iq_stanza => {
// Check that our own device is added again, but that removed // Check that our own device is added again, but that removed
// devices are not added. // devices are not added.
expect(iq_stanza.outerHTML).toBe( expect(iq_stanza.toLocaleString()).toBe(
'<iq from="dummy@localhost" type="set" xmlns="jabber:client" id="'+iq_stanza.getAttribute('id')+'">'+ `<iq from='dummy@localhost' type='set' xmlns='jabber:client' id='${iq_stanza.nodeTree.getAttribute(`id`)}'>`+
'<pubsub xmlns="http://jabber.org/protocol/pubsub">'+ `<pubsub xmlns='http://jabber.org/protocol/pubsub'>`+
'<publish node="eu.siacs.conversations.axolotl.devicelist">'+ `<publish node='eu.siacs.conversations.axolotl.devicelist'>`+
'<item>'+ `<item>`+
'<list xmlns="eu.siacs.conversations.axolotl">'+ `<list xmlns='eu.siacs.conversations.axolotl'>`+
'<device id="123456789"/>'+ `<device id='123456789'/>`+
'<device id="444"/>'+ `<device id='444'/>`+
'</list>'+ `</list>`+
'</item>'+ `</item>`+
'</publish>'+ `</publish>`+
'</pubsub>'+ `</pubsub>`+
'</iq>'); `</iq>`);
expect(_converse.devicelists.length).toBe(2); expect(_converse.devicelists.length).toBe(2);
const devices = _converse.devicelists.get(_converse.bare_jid).devices; const devices = _converse.devicelists.get(_converse.bare_jid).devices;
// The device id for this device (123456789) was also generated and added to the list, // The device id for this device (123456789) was also generated and added to the list,
...@@ -486,16 +486,16 @@ ...@@ -486,16 +486,16 @@
test_utils.waitUntil(() => deviceListFetched(_converse, _converse.bare_jid)) test_utils.waitUntil(() => deviceListFetched(_converse, _converse.bare_jid))
.then(iq_stanza => { .then(iq_stanza => {
expect(iq_stanza.outerHTML).toBe( expect(iq_stanza.toLocaleString()).toBe(
'<iq type="get" from="dummy@localhost" to="dummy@localhost" xmlns="jabber:client" id="'+iq_stanza.getAttribute("id")+'">'+ `<iq type='get' from='dummy@localhost' to='dummy@localhost' xmlns='jabber:client' id='${iq_stanza.nodeTree.getAttribute('id')}'>`+
'<pubsub xmlns="http://jabber.org/protocol/pubsub">'+ `<pubsub xmlns='http://jabber.org/protocol/pubsub'>`+
'<items node="eu.siacs.conversations.axolotl.devicelist"/>'+ `<items node='eu.siacs.conversations.axolotl.devicelist'/>`+
'</pubsub>'+ `</pubsub>`+
'</iq>'); `</iq>`);
const stanza = $iq({ const stanza = $iq({
'from': contact_jid, 'from': contact_jid,
'id': iq_stanza.getAttribute('id'), 'id': iq_stanza.nodeTree.getAttribute('id'),
'to': _converse.bare_jid, 'to': _converse.bare_jid,
'type': 'result', 'type': 'result',
}).c('pubsub', {'xmlns': "http://jabber.org/protocol/pubsub"}) }).c('pubsub', {'xmlns': "http://jabber.org/protocol/pubsub"})
...@@ -515,7 +515,7 @@ ...@@ -515,7 +515,7 @@
}).then(iq_stanza => { }).then(iq_stanza => {
const stanza = $iq({ const stanza = $iq({
'from': _converse.bare_jid, 'from': _converse.bare_jid,
'id': iq_stanza.getAttribute('id'), 'id': iq_stanza.nodeTree.getAttribute('id'),
'to': _converse.bare_jid, 'to': _converse.bare_jid,
'type': 'result'}); 'type': 'result'});
_converse.connection._dataRecv(test_utils.createRequest(stanza)); _converse.connection._dataRecv(test_utils.createRequest(stanza));
...@@ -523,7 +523,7 @@ ...@@ -523,7 +523,7 @@
}).then(iq_stanza => { }).then(iq_stanza => {
const stanza = $iq({ const stanza = $iq({
'from': _converse.bare_jid, 'from': _converse.bare_jid,
'id': iq_stanza.getAttribute('id'), 'id': iq_stanza.nodeTree.getAttribute('id'),
'to': _converse.bare_jid, 'to': _converse.bare_jid,
'type': 'result'}); 'type': 'result'});
_converse.connection._dataRecv(test_utils.createRequest(stanza)); _converse.connection._dataRecv(test_utils.createRequest(stanza));
...@@ -642,7 +642,7 @@ ...@@ -642,7 +642,7 @@
.then(iq_stanza => { .then(iq_stanza => {
const stanza = $iq({ const stanza = $iq({
'from': contact_jid, 'from': contact_jid,
'id': iq_stanza.getAttribute('id'), 'id': iq_stanza.nodeTree.getAttribute('id'),
'to': _converse.bare_jid, 'to': _converse.bare_jid,
'type': 'result', 'type': 'result',
}).c('pubsub', {'xmlns': "http://jabber.org/protocol/pubsub"}) }).c('pubsub', {'xmlns': "http://jabber.org/protocol/pubsub"})
...@@ -658,25 +658,25 @@ ...@@ -658,25 +658,25 @@
.then(iq_stanza => { .then(iq_stanza => {
const stanza = $iq({ const stanza = $iq({
'from': _converse.bare_jid, 'from': _converse.bare_jid,
'id': iq_stanza.getAttribute('id'), 'id': iq_stanza.nodeTree.getAttribute('id'),
'to': _converse.bare_jid, 'to': _converse.bare_jid,
'type': 'result'}); 'type': 'result'});
_converse.connection._dataRecv(test_utils.createRequest(stanza)); _converse.connection._dataRecv(test_utils.createRequest(stanza));
return test_utils.waitUntil(() => bundleHasBeenPublished(_converse)); return test_utils.waitUntil(() => bundleHasBeenPublished(_converse));
}).then(iq_stanza => { }).then(iq_stanza => {
expect(iq_stanza.outerHTML).toBe( expect(iq_stanza.toLocaleString()).toBe(
`<iq from="dummy@localhost" type="set" xmlns="jabber:client" id="${iq_stanza.getAttribute('id')}">`+ `<iq from='dummy@localhost' type='set' xmlns='jabber:client' id='${iq_stanza.nodeTree.getAttribute('id')}'>`+
`<pubsub xmlns="http://jabber.org/protocol/pubsub">`+ `<pubsub xmlns='http://jabber.org/protocol/pubsub'>`+
`<publish node="eu.siacs.conversations.axolotl.bundles:123456789">`+ `<publish node='eu.siacs.conversations.axolotl.bundles:123456789'>`+
`<item>`+ `<item>`+
`<bundle xmlns="eu.siacs.conversations.axolotl">`+ `<bundle xmlns='eu.siacs.conversations.axolotl'>`+
`<signedPreKeyPublic signedPreKeyId="0">${btoa('1234')}</signedPreKeyPublic>`+ `<signedPreKeyPublic signedPreKeyId='0'>${btoa('1234')}</signedPreKeyPublic>`+
`<signedPreKeySignature>${btoa('11112222333344445555')}</signedPreKeySignature>`+ `<signedPreKeySignature>${btoa('11112222333344445555')}</signedPreKeySignature>`+
`<identityKey>${btoa('1234')}</identityKey>`+ `<identityKey>${btoa('1234')}</identityKey>`+
`<prekeys>`+ `<prekeys>`+
`<preKeyPublic preKeyId="0">${btoa('1234')}</preKeyPublic>`+ `<preKeyPublic preKeyId='0'>${btoa('1234')}</preKeyPublic>`+
`<preKeyPublic preKeyId="1">${btoa('1234')}</preKeyPublic>`+ `<preKeyPublic preKeyId='1'>${btoa('1234')}</preKeyPublic>`+
`</prekeys>`+ `</prekeys>`+
`</bundle>`+ `</bundle>`+
`</item>`+ `</item>`+
...@@ -686,7 +686,7 @@ ...@@ -686,7 +686,7 @@
const stanza = $iq({ const stanza = $iq({
'from': _converse.bare_jid, 'from': _converse.bare_jid,
'id': iq_stanza.getAttribute('id'), 'id': iq_stanza.nodeTree.getAttribute('id'),
'to': _converse.bare_jid, 'to': _converse.bare_jid,
'type': 'result'}); 'type': 'result'});
_converse.connection._dataRecv(test_utils.createRequest(stanza)); _converse.connection._dataRecv(test_utils.createRequest(stanza));
...@@ -707,16 +707,16 @@ ...@@ -707,16 +707,16 @@
test_utils.waitUntil(() => deviceListFetched(_converse, _converse.bare_jid)) test_utils.waitUntil(() => deviceListFetched(_converse, _converse.bare_jid))
.then(iq_stanza => { .then(iq_stanza => {
expect(iq_stanza.outerHTML).toBe( expect(iq_stanza.toLocaleString()).toBe(
'<iq type="get" from="dummy@localhost" to="dummy@localhost" xmlns="jabber:client" id="'+iq_stanza.getAttribute("id")+'">'+ `<iq type='get' from='dummy@localhost' to='dummy@localhost' xmlns='jabber:client' id='${iq_stanza.nodeTree.getAttribute('id')}'>`+
'<pubsub xmlns="http://jabber.org/protocol/pubsub">'+ `<pubsub xmlns='http://jabber.org/protocol/pubsub'>`+
'<items node="eu.siacs.conversations.axolotl.devicelist"/>'+ `<items node='eu.siacs.conversations.axolotl.devicelist'/>`+
'</pubsub>'+ `</pubsub>`+
'</iq>'); `</iq>`);
const stanza = $iq({ const stanza = $iq({
'from': _converse.bare_jid, 'from': _converse.bare_jid,
'id': iq_stanza.getAttribute('id'), 'id': iq_stanza.nodeTree.getAttribute('id'),
'to': _converse.bare_jid, 'to': _converse.bare_jid,
'type': 'result', 'type': 'result',
}).c('pubsub', {'xmlns': "http://jabber.org/protocol/pubsub"}) }).c('pubsub', {'xmlns': "http://jabber.org/protocol/pubsub"})
...@@ -735,42 +735,42 @@ ...@@ -735,42 +735,42 @@
// Check that own device was published // Check that own device was published
return test_utils.waitUntil(() => ownDeviceHasBeenPublished(_converse)); return test_utils.waitUntil(() => ownDeviceHasBeenPublished(_converse));
}).then(iq_stanza => { }).then(iq_stanza => {
expect(iq_stanza.outerHTML).toBe( expect(iq_stanza.toLocaleString()).toBe(
'<iq from="dummy@localhost" type="set" xmlns="jabber:client" id="'+iq_stanza.getAttribute('id')+'">'+ `<iq from='dummy@localhost' type='set' xmlns='jabber:client' id='${iq_stanza.nodeTree.getAttribute(`id`)}'>`+
'<pubsub xmlns="http://jabber.org/protocol/pubsub">'+ `<pubsub xmlns='http://jabber.org/protocol/pubsub'>`+
'<publish node="eu.siacs.conversations.axolotl.devicelist">'+ `<publish node='eu.siacs.conversations.axolotl.devicelist'>`+
'<item>'+ `<item>`+
'<list xmlns="eu.siacs.conversations.axolotl">'+ `<list xmlns='eu.siacs.conversations.axolotl'>`+
'<device id="482886413b977930064a5888b92134fe"/>'+ `<device id='482886413b977930064a5888b92134fe'/>`+
'<device id="123456789"/>'+ `<device id='123456789'/>`+
'</list>'+ `</list>`+
'</item>'+ `</item>`+
'</publish>'+ `</publish>`+
'</pubsub>'+ `</pubsub>`+
'</iq>'); `</iq>`);
const stanza = $iq({ const stanza = $iq({
'from': _converse.bare_jid, 'from': _converse.bare_jid,
'id': iq_stanza.getAttribute('id'), 'id': iq_stanza.nodeTree.getAttribute('id'),
'to': _converse.bare_jid, 'to': _converse.bare_jid,
'type': 'result'}); 'type': 'result'});
_converse.connection._dataRecv(test_utils.createRequest(stanza)); _converse.connection._dataRecv(test_utils.createRequest(stanza));
return test_utils.waitUntil(() => bundleHasBeenPublished(_converse)); return test_utils.waitUntil(() => _.get(bundleHasBeenPublished(_converse), 'nodeTree'));
}).then(iq_stanza => { }).then(iq_el => {
expect(iq_stanza.getAttributeNames().sort().join()).toBe(["from", "type", "xmlns", "id"].sort().join()); expect(iq_el.getAttributeNames().sort().join()).toBe(["from", "type", "xmlns", "id"].sort().join());
expect(iq_stanza.querySelector('prekeys').childNodes.length).toBe(100); expect(iq_el.querySelector('prekeys').childNodes.length).toBe(100);
const signed_prekeys = iq_stanza.querySelectorAll('signedPreKeyPublic'); const signed_prekeys = iq_el.querySelectorAll('signedPreKeyPublic');
expect(signed_prekeys.length).toBe(1); expect(signed_prekeys.length).toBe(1);
const signed_prekey = signed_prekeys[0]; const signed_prekey = signed_prekeys[0];
expect(signed_prekey.getAttribute('signedPreKeyId')).toBe('0') expect(signed_prekey.getAttribute('signedPreKeyId')).toBe('0')
expect(iq_stanza.querySelectorAll('signedPreKeySignature').length).toBe(1); expect(iq_el.querySelectorAll('signedPreKeySignature').length).toBe(1);
expect(iq_stanza.querySelectorAll('identityKey').length).toBe(1); expect(iq_el.querySelectorAll('identityKey').length).toBe(1);
const stanza = $iq({ const stanza = $iq({
'from': _converse.bare_jid, 'from': _converse.bare_jid,
'id': iq_stanza.getAttribute('id'), 'id': iq_el.getAttribute('id'),
'to': _converse.bare_jid, 'to': _converse.bare_jid,
'type': 'result'}); 'type': 'result'});
_converse.connection._dataRecv(test_utils.createRequest(stanza)); _converse.connection._dataRecv(test_utils.createRequest(stanza));
...@@ -780,16 +780,16 @@ ...@@ -780,16 +780,16 @@
}).then(() => { }).then(() => {
return test_utils.waitUntil(() => deviceListFetched(_converse, contact_jid)); return test_utils.waitUntil(() => deviceListFetched(_converse, contact_jid));
}).then(iq_stanza => { }).then(iq_stanza => {
expect(iq_stanza.outerHTML).toBe( expect(iq_stanza.toLocaleString()).toBe(
'<iq type="get" from="dummy@localhost" to="'+contact_jid+'" xmlns="jabber:client" id="'+iq_stanza.getAttribute("id")+'">'+ `<iq type='get' from='dummy@localhost' to='${contact_jid}' xmlns='jabber:client' id='${iq_stanza.nodeTree.getAttribute('id')}'>`+
'<pubsub xmlns="http://jabber.org/protocol/pubsub">'+ `<pubsub xmlns='http://jabber.org/protocol/pubsub'>`+
'<items node="eu.siacs.conversations.axolotl.devicelist"/>'+ `<items node='eu.siacs.conversations.axolotl.devicelist'/>`+
'</pubsub>'+ `</pubsub>`+
'</iq>'); `</iq>`);
const stanza = $iq({ const stanza = $iq({
'from': contact_jid, 'from': contact_jid,
'id': iq_stanza.getAttribute('id'), 'id': iq_stanza.nodeTree.getAttribute('id'),
'to': _converse.bare_jid, 'to': _converse.bare_jid,
'type': 'result', 'type': 'result',
}).c('pubsub', {'xmlns': "http://jabber.org/protocol/pubsub"}) }).c('pubsub', {'xmlns': "http://jabber.org/protocol/pubsub"})
...@@ -869,14 +869,14 @@ ...@@ -869,14 +869,14 @@
return test_utils.waitUntil(() => u.isVisible(modal.el), 1000); return test_utils.waitUntil(() => u.isVisible(modal.el), 1000);
}).then(() => test_utils.waitUntil(() => deviceListFetched(_converse, contact_jid))) }).then(() => test_utils.waitUntil(() => deviceListFetched(_converse, contact_jid)))
.then(iq_stanza => { .then(iq_stanza => {
expect(iq_stanza.outerHTML).toBe( expect(iq_stanza.toLocaleString()).toBe(
`<iq type="get" from="dummy@localhost" to="max.frankfurter@localhost" xmlns="jabber:client" id="${iq_stanza.getAttribute('id')}">`+ `<iq type='get' from='dummy@localhost' to='max.frankfurter@localhost' xmlns='jabber:client' id='${iq_stanza.nodeTree.getAttribute('id')}'>`+
`<pubsub xmlns="http://jabber.org/protocol/pubsub"><items node="eu.siacs.conversations.axolotl.devicelist"/></pubsub>`+ `<pubsub xmlns='http://jabber.org/protocol/pubsub'><items node='eu.siacs.conversations.axolotl.devicelist'/></pubsub>`+
`</iq>`); `</iq>`);
const stanza = $iq({ const stanza = $iq({
'from': contact_jid, 'from': contact_jid,
'id': iq_stanza.getAttribute('id'), 'id': iq_stanza.nodeTree.getAttribute('id'),
'to': _converse.bare_jid, 'to': _converse.bare_jid,
'type': 'result', 'type': 'result',
}).c('pubsub', {'xmlns': "http://jabber.org/protocol/pubsub"}) }).c('pubsub', {'xmlns': "http://jabber.org/protocol/pubsub"})
...@@ -889,16 +889,16 @@ ...@@ -889,16 +889,16 @@
return test_utils.waitUntil(() => u.isVisible(modal.el), 1000); return test_utils.waitUntil(() => u.isVisible(modal.el), 1000);
}).then(() => test_utils.waitUntil(() => bundleFetched(_converse, contact_jid, '555'))) }).then(() => test_utils.waitUntil(() => bundleFetched(_converse, contact_jid, '555')))
.then(iq_stanza => { .then(iq_stanza => {
expect(iq_stanza.outerHTML).toBe( expect(iq_stanza.toLocaleString()).toBe(
`<iq type="get" from="dummy@localhost" to="max.frankfurter@localhost" xmlns="jabber:client" id="${iq_stanza.getAttribute('id')}">`+ `<iq type='get' from='dummy@localhost' to='max.frankfurter@localhost' xmlns='jabber:client' id='${iq_stanza.nodeTree.getAttribute('id')}'>`+
`<pubsub xmlns="http://jabber.org/protocol/pubsub">`+ `<pubsub xmlns='http://jabber.org/protocol/pubsub'>`+
`<items node="eu.siacs.conversations.axolotl.bundles:555"/>`+ `<items node='eu.siacs.conversations.axolotl.bundles:555'/>`+
`</pubsub>`+ `</pubsub>`+
`</iq>`); `</iq>`);
const stanza = $iq({ const stanza = $iq({
'from': contact_jid, 'from': contact_jid,
'id': iq_stanza.getAttribute('id'), 'id': iq_stanza.nodeTree.getAttribute('id'),
'to': _converse.bare_jid, 'to': _converse.bare_jid,
'type': 'result', 'type': 'result',
}).c('pubsub', { }).c('pubsub', {
......
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