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

Fix failing test and use async/await

Browse Source
This commit is contained in:
JC Brand 2018-11-12 12:04:56 +01:00
parent affafc746c
commit 9e33279fc2
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
spec/roster.js
View File

@ -1187,29 +1187,24 @@
it("can have their requests accepted by the user", it("can have their requests accepted by the user",
mock.initConverseWithPromises( mock.initConverseWithPromises(
null, ['rosterGroupsFetched'], {}, null, ['rosterGroupsFetched'], {},
function (done, _converse) { async function (done, _converse) {
test_utils.openControlBox(); test_utils.openControlBox();
test_utils.createContacts(_converse, 'requesting').openControlBox(); test_utils.createContacts(_converse, 'requesting').openControlBox();
test_utils.waitUntil(function () { await test_utils.waitUntil(() => _converse.rosterview.el.querySelectorAll('.roster-group li').length)
return $(_converse.rosterview.el).find('.roster-group li').length;
}, 700).then(function () {
// TODO: Testing can be more thorough here, the user is // TODO: Testing can be more thorough here, the user is
// actually not accepted/authorized because of // actually not accepted/authorized because of
// mock_connection. // mock_connection.
var name = mock.req_names.sort()[0]; const jid = mock.req_names.sort()[0].replace(/ /g,'.').toLowerCase() + '@localhost';
var jid = name.replace(/ /g,'.').toLowerCase() + '@localhost'; const contact = _converse.roster.get(jid);
var contact = _converse.roster.get(jid); spyOn(contact, 'authorize').and.callFake(() => contact);
spyOn(_converse.roster, 'sendContactAddIQ').and.callFake(function (jid, fullname, groups, callback) { spyOn(_converse.roster, 'sendContactAddIQ').and.callFake(() => Promise.resolve());
callback();
});
spyOn(contact, 'authorize').and.callFake(function () { return contact; });
$(_converse.rosterview.el).find(".req-contact-name:contains('"+name+"')") $(_converse.rosterview.el).find(".req-contact-name:contains('"+name+"')")
.parent().parent().find('.accept-xmpp-request')[0].click(); .parent().parent().find('.accept-xmpp-request')[0].click();
expect(_converse.roster.sendContactAddIQ).toHaveBeenCalled(); expect(_converse.roster.sendContactAddIQ).toHaveBeenCalled();
await test_utils.waitUntil(() => contact.authorize.calls.count());
expect(contact.authorize).toHaveBeenCalled(); expect(contact.authorize).toHaveBeenCalled();
done(); done();
});
})); }));
it("can have their requests denied by the user", it("can have their requests denied by the user",