Fix failing tests

spec/converse.js

@@ -214,12 +214,12 @@
 
         describe("The \"contacts\" API", function () {
 
-            it("has a method 'get' which returns wrapped contacts", mock.initConverse(async (done, _converse) => {
-                // Check that it returns nothing if a non-existing JID is given
-                test_utils.createContacts(_converse, 'current');
-                // Hack to avoid having to fetch the roster again.
-                _converse.session.set('roster_fetched', true);
+            it("has a method 'get' which returns wrapped contacts",
+                mock.initConverse(
+                    null, ['emojisInitialized'], {},
+                    async function (done, _converse) {
 
+                await test_utils.waitForRoster(_converse, 'current');
                 let contact = await _converse.api.contacts.get('non-existing@jabber.org');
                 expect(contact).toBeFalsy();
                 // Check when a single jid is given

spec/http-file-upload.js

@@ -170,14 +170,15 @@
         describe("When not supported", function () {
             describe("A file upload toolbar button", function () {
 
-                it("does not appear in private chats", mock.initConverse(async (done, _converse) => {
-                    var contact_jid = mock.cur_names[2].replace(/ /g,'.').toLowerCase() + '@montague.lit';
-                    test_utils.createContacts(_converse, 'current');
-                    // Hack to avoid having to fetch the roster again.
-                    _converse.session.set('roster_fetched', true);
-
-                    test_utils.openChatBoxFor(_converse, contact_jid);
-
+                it("does not appear in private chats",
+                    mock.initConverse(
+                        null, ['emojisInitialized'], {},
+                        async function (done, _converse) {
+
+                    await test_utils.waitForRoster(_converse, 'current', 3);
+                    test_utils.openControlBox();
+                    const contact_jid = mock.cur_names[0].replace(/ /g,'.').toLowerCase() + '@montague.lit';
+                    await test_utils.openChatBoxFor(_converse, contact_jid);
                     await test_utils.waitUntilDiscoConfirmed(
                         _converse, _converse.domain,
                         [{'category': 'server', 'type':'IM'}],

spec/notification.js

@@ -19,11 +19,7 @@
                             null, ['rosterGroupsFetched'], {},
                             async (done, _converse) => {
 
-                        // TODO: not yet testing show_desktop_notifications setting
-                        await test_utils.createContacts(_converse, 'current');
-                        // Hack to avoid having to fetch the roster again.
-                        _converse.session.set('roster_fetched', true);
-
+                        await test_utils.waitForRoster(_converse, 'current');
                         spyOn(_converse, 'showMessageNotification').and.callThrough();
                         spyOn(_converse, 'areDesktopNotificationsEnabled').and.returnValue(true);
                         spyOn(_converse, 'isMessageToHiddenChat').and.returnValue(true);