Get tests to run agains the webpack build

package-lock.json

@@ -6931,6 +6931,12 @@
       "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
       "dev": true
     },
+    "lodash-template-loader": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lodash-template-loader/-/lodash-template-loader-2.0.0.tgz",
+      "integrity": "sha1-jsqfgFXIzS6E4wzrPlzZFQGJpfo=",
+      "dev": true
+    },
     "lodash-template-webpack-loader": {
       "version": "github:jcbrand/lodash-template-webpack-loader#258c095ab22130dfde454fa59ee0986f302bb733",
       "dev": true,
@@ -12953,6 +12959,12 @@
         "resolve-from": "1.0.1"
       }
     },
+    "requirejs": {
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.5.tgz",
+      "integrity": "sha512-svnO+aNcR/an9Dpi44C7KSAy5fFGLtmPbaaCeQaklUz8BQhS64tWWIIlvEA5jrWICzlO/X9KSzSeXFnZdBu8nw==",
+      "dev": true
+    },
     "requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",

package.json

@@ -59,12 +59,14 @@
     "jsdoc": "^3.5.5",
     "jshint": "^2.9.4",
     "lodash": "4.17.4",
+    "lodash-template-loader": "^2.0.0",
     "lodash-template-webpack-loader": "jcbrand/lodash-template-webpack-loader",
     "moment": "~> 2.19.3 ",
     "npm": "^5.7.1",
     "otr": "0.2.16",
     "pluggable.js": "2.0.0",
     "po2json": "^0.4.4",
+    "requirejs": "2.3.5",
     "run-headless-chromium": "^0.1.1",
     "sinon": "^2.1.0",
     "sizzle": "^2.3.3",

spec/bookmarks.js

@@ -4,12 +4,10 @@
     define([
         "jasmine",
         "jquery",
-        "converse-core",
-        "utils",
         "mock",
         "test-utils"
         ], factory);
-} (this, function (jasmine, $, converse, utils, mock, test_utils) {
+} (this, function (jasmine, $, mock, test_utils) {
     "use strict";
     var $iq = converse.env.$iq,
         $msg = converse.env.$msg,

spec/chatbox.js

@@ -2,12 +2,10 @@
     define([
         "jquery",
         "jasmine",
-        "utils",
-        "converse-core",
         "mock",
         "test-utils"
         ], factory);
-} (this, function ($, jasmine, utils, converse, mock, test_utils) {
+} (this, function ($, jasmine, mock, test_utils) {
     "use strict";
     var _ = converse.env._;
     var $iq = converse.env.$iq;
@@ -458,7 +456,7 @@
                     var timeout = false;
 
                     test_utils.waitUntil(function () {
-                        return utils.isVisible(view.el.querySelector('.toggle-smiley .emoji-picker-container'));
+                        return u.isVisible(view.el.querySelector('.toggle-smiley .emoji-picker-container'));
                     }, 500).then(function () {
                         var picker = view.el.querySelector('.toggle-smiley .emoji-picker-container');
                         var items = picker.querySelectorAll('.emoji-picker li');

spec/chatroom.js

@@ -1,6 +1,6 @@
 (function (root, factory) {
-    define(["jquery", "jasmine", "mock", "converse-core", "test-utils", "utils" ], factory);
-} (this, function ($, jasmine, mock, converse, test_utils, utils) {
+    define(["jquery", "jasmine", "mock", "test-utils" ], factory);
+} (this, function ($, jasmine, mock, test_utils) {
     var _ = converse.env._;
     var $pres = converse.env.$pres;
     var $iq = converse.env.$iq;

spec/controlbox.js

@@ -1,6 +1,6 @@
 (function (root, factory) {
-    define(["jquery", "jasmine", "mock", "converse-core", "test-utils"], factory);
-} (this, function ($, jasmine, mock, converse, test_utils) {
+    define(["jquery", "jasmine", "mock", "test-utils"], factory);
+} (this, function ($, jasmine, mock, test_utils) {
     var _ = converse.env._;
     var $pres = converse.env.$pres;
     var $msg = converse.env.$msg;

spec/converse.js

@@ -2,10 +2,9 @@
     define([
         "jquery",
         "jasmine",
-        "converse-core",
         "mock",
         "test-utils"], factory);
-} (this, function ($, jasmine, converse, mock, test_utils) {
+} (this, function ($, jasmine, mock, test_utils) {
     var b64_sha1 = converse.env.b64_sha1;
     var _ = converse.env._;
 

spec/disco.js

@@ -2,10 +2,9 @@
     define([
         "jasmine",
         "jquery",
-        "converse-core",
         "mock",
         "test-utils"], factory);
-} (this, function (jasmine, $, converse, mock, test_utils) {
+} (this, function (jasmine, $, mock, test_utils) {
     "use strict";
     var Strophe = converse.env.Strophe;
     var $iq = converse.env.$iq;

spec/eventemitter.js

@@ -1,6 +1,6 @@
 (function (root, factory) {
-    define(["jasmine", "mock", "converse-core", "test-utils"], factory);
-} (this, function (jasmine, mock, converse, test_utils) {
+    define(["jasmine", "mock", "test-utils"], factory);
+} (this, function (jasmine, mock, test_utils) {
 
     return describe("The _converse Event Emitter", function() {
 

spec/headline.js

@@ -2,15 +2,14 @@
     define([
         "jasmine",
         "jquery",
-        "converse-core",
-        "utils",
         "mock",
         "test-utils"
         ], factory);
-} (this, function (jasmine, $, converse, utils, mock, test_utils) {
+} (this, function (jasmine, $, mock, test_utils) {
     "use strict";
     var $msg = converse.env.$msg,
-        _ = converse.env._;
+        _ = converse.env._,
+        utils = converse.env.utils;
 
     describe("A headlines box", function () {
 

spec/http-file-upload.js

@@ -1,11 +1,9 @@
 (function (root, factory) {
     define([
         "jasmine",
-        "jquery",
-        "converse-core",
         "mock",
         "test-utils"], factory);
-} (this, function (jasmine, $, converse, mock, test_utils) {
+} (this, function (jasmine, mock, test_utils) {
     "use strict";
     var Strophe = converse.env.Strophe;
     var $iq = converse.env.$iq;

spec/login.js

@@ -1,6 +1,6 @@
 (function (root, factory) {
-    define(["jasmine", "mock", "converse-core", "test-utils"], factory);
-} (this, function (jasmine, mock, converse, test_utils) {
+    define(["jasmine", "mock", "test-utils"], factory);
+} (this, function (jasmine, mock, test_utils) {
 
     describe("The Login Form", function () {
 

spec/mam.js

@@ -1,6 +1,6 @@
 (function (root, factory) {
-    define(["jasmine", "mock", "converse-core", "test-utils"], factory);
-} (this, function (jasmine, mock, converse, test_utils) {
+    define(["jasmine", "mock", "test-utils"], factory);
+} (this, function (jasmine, mock, test_utils) {
     "use strict";
     var _ = converse.env._;
     var Backbone = converse.env.Backbone;

spec/messages.js

@@ -2,12 +2,10 @@
     define([
         "jquery",
         "jasmine",
-        "utils",
-        "converse-core",
         "mock",
         "test-utils"
         ], factory);
-} (this, function ($, jasmine, utils, converse, mock, test_utils) {
+} (this, function ($, jasmine, mock, test_utils) {
     "use strict";
     var _ = converse.env._;
     var $iq = converse.env.$iq;
@@ -630,7 +628,7 @@
             */
             sinon.spy(_converse, 'log');
             sinon.spy(_converse.chatboxes, 'getChatBox');
-            sinon.spy(utils, 'isHeadlineMessage');
+            sinon.spy(u, 'isHeadlineMessage');
             var msg = $msg({
                     from: 'localhost',
                     to: _converse.bare_jid,
@@ -642,13 +640,13 @@
                 "onMessage: Ignoring incoming headline message sent with type 'chat' from JID: localhost",
                 Strophe.LogLevel.INFO
             )).toBeTruthy();
-            expect(utils.isHeadlineMessage.called).toBeTruthy();
-            expect(utils.isHeadlineMessage.returned(true)).toBeTruthy();
+            expect(u.isHeadlineMessage.called).toBeTruthy();
+            expect(u.isHeadlineMessage.returned(true)).toBeTruthy();
             expect(_converse.chatboxes.getChatBox.called).toBeFalsy();
             // Remove sinon spies
             _converse.log.restore();
             _converse.chatboxes.getChatBox.restore();
-            utils.isHeadlineMessage.restore();
+            u.isHeadlineMessage.restore();
             done();
         }));
 

spec/minchats.js

@@ -1,6 +1,6 @@
 (function (root, factory) {
-    define(["jquery", "jasmine", "mock", "converse-core", "test-utils"], factory);
-} (this, function ($, jasmine, mock, converse, test_utils) {
+    define(["jquery", "jasmine", "mock", "test-utils"], factory);
+} (this, function ($, jasmine, mock, test_utils) {
     var _ = converse.env._;
     var $msg = converse.env.$msg;
 

spec/notification.js

@@ -1,6 +1,6 @@
 (function (root, factory) {
-    define(["jquery", "jasmine", "mock", "converse-core", "test-utils", "utils"], factory);
-} (this, function ($, jasmine, mock, converse, test_utils, utils) {
+    define(["jquery", "jasmine", "mock", "test-utils"], factory);
+} (this, function ($, jasmine, mock, test_utils) {
     "use strict";
     var _ = converse.env._;
     var $msg = converse.env.$msg;

spec/otr.js

@@ -1,6 +1,6 @@
 (function (root, factory) {
-    define(["jquery", "jasmine", "mock", "converse-core", "test-utils"], factory);
-} (this, function ($, jasmine, mock, converse, test_utils) {
+    define(["jquery", "jasmine", "mock", "test-utils"], factory);
+} (this, function ($, jasmine, mock, test_utils) {
     var Strophe = converse.env.Strophe;
     var b64_sha1 = converse.env.b64_sha1;
     var $pres = converse.env.$pres;

spec/ping.js

@@ -1,5 +1,5 @@
 (function (root, factory) {
-    define(["jasmine", "mock", "converse-core", "test-utils", "converse-ping"], factory);
+    define(["jasmine", "mock", "test-utils"], factory);
 } (this, function (jasmine, mock, test_utils) {
     "use strict";
 

spec/presence.js

@@ -4,15 +4,15 @@
     define([
         "jasmine",
         "jquery",
-        "converse-core",
         "mock",
         "test-utils",
-        "lodash"], factory);
-} (this, function (jasmine, $, converse, mock, test_utils, _) {
+    ], factory);
+} (this, function (jasmine, $, mock, test_utils) {
     "use strict";
     var Strophe = converse.env.Strophe;
     var $iq = converse.env.$iq;
     var $pres = converse.env.$pres;
+    var _ = converse.env._;
     var u = converse.env.utils;
     // See: https://xmpp.org/rfcs/rfc3921.html
 

spec/profiling.js

@@ -1,8 +1,9 @@
 (function (root, factory) {
-    define(["jasmine", "mock", "converse-core", "test-utils", "utils"], factory);
-} (this, function (jasmine, mock, converse, test_utils, u) {
+    define(["jasmine", "mock", "test-utils"], factory);
+} (this, function (jasmine, mock, test_utils) {
     var _ = converse.env._;
     var $iq = converse.env.$iq;
+    var u = converse.env.utils;
 
     describe("Profiling", function() {
         xit("adds hundreds of contacts to the roster",

spec/protocol.js

@@ -2,10 +2,9 @@
     define([
         "jasmine",
         "jquery",
-        "converse-core",
         "mock",
         "test-utils"], factory);
-} (this, function (jasmine, $, converse, mock, test_utils) {
+} (this, function (jasmine, $, mock, test_utils) {
     "use strict";
     var Strophe = converse.env.Strophe;
     var $iq = converse.env.$iq;

spec/register.js

@@ -1,6 +1,6 @@
 (function (root, factory) {
-    define(["jquery", "jasmine", "mock", "converse-core", "test-utils"], factory);
-} (this, function ($, jasmine, mock, converse, test_utils) {
+    define(["jquery", "jasmine", "mock", "test-utils"], factory);
+} (this, function ($, jasmine, mock, test_utils) {
     var Strophe = converse.env.Strophe;
     var $iq = converse.env.$iq;
     var _ = converse.env._;

spec/roomslist.js

@@ -1,6 +1,6 @@
 (function (root, factory) {
-    define(["jasmine", "mock", "converse-core", "converse-roomslist", "test-utils"], factory);
-} (this, function (jasmine, mock, converse, roomslist, test_utils) {
+    define(["jasmine", "mock", "test-utils"], factory);
+} (this, function (jasmine, mock, test_utils) {
     var _ = converse.env._;
     var $msg = converse.env.$msg;
     var Promise = converse.env.Promise;

spec/roster.js

@@ -1,6 +1,6 @@
 (function (root, factory) {
-    define(["jquery", "jasmine", "mock", "converse-core", "test-utils"], factory);
-} (this, function ($, jasmine, mock, converse, test_utils) {
+    define(["jquery", "jasmine", "mock", "test-utils"], factory);
+} (this, function ($, jasmine, mock, test_utils) {
     var _ = converse.env._;
     var Strophe = converse.env.Strophe;
     var $pres = converse.env.$pres;

spec/spoilers.js

@@ -1,12 +1,6 @@
 (function (root, factory) {
-    define([
-        "jasmine",
-        "utils",
-        "mock",
-        "converse-core",
-        "test-utils"
-        ], factory);
-} (this, function (jasmine, utils, mock, converse, test_utils) {
+    define(["jasmine", "mock", "test-utils"], factory);
+} (this, function (jasmine, mock, test_utils) {
 
     var _ = converse.env._;
     var Strophe = converse.env.Strophe;

spec/user-details-modal.js

@@ -1,12 +1,10 @@
 (function (root, factory) {
     define([
         "jasmine",
-        "utils",
-        "converse-core",
         "mock",
         "test-utils"
         ], factory);
-} (this, function (jasmine, utils, converse, mock, test_utils) {
+} (this, function (jasmine, mock, test_utils) {
     "use strict";
     var _ = converse.env._;
     var $iq = converse.env.$iq;

spec/utils.js

@@ -1,6 +1,6 @@
 (function (root, factory) {
-    define(["jasmine", "converse-core"], factory);
-} (this, function (jasmine, converse) {
+    define(["jasmine"], factory);
+} (this, function (jasmine) {
     var utils = converse.env.utils,
         _ = converse.env._;
 

spec/xmppstatus.js

@@ -1,6 +1,6 @@
 (function (root, factory) {
-    define(["jquery", "jasmine", "mock", "converse-core", "test-utils"], factory);
-} (this, function ($, jasmine, mock, converse, test_utils) {
+    define(["jquery", "jasmine", "mock", "test-utils"], factory);
+} (this, function ($, jasmine, mock, test_utils) {
 
     return describe("The XMPPStatus model", function() {
 

tests/index.html

@@ -12,7 +12,7 @@
     <link type="text/css" rel="stylesheet" media="screen" href="../css/website.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="../css/converse.css" />
 
-    <script src="../src/config.js"></script>
+    <script src="../dist/converse.js"></script>
     <script data-main="runner" src="../node_modules/requirejs/require.js"></script>
 
     <style>

tests/mock.js

@@ -1,6 +1,6 @@
 (function (root, factory) {
-    define("mock", ['converse'], factory);
-}(this, function (converse) {
+    define("mock", [], factory);
+}(this, function () {
     var _ = converse.env._;
     var Promise = converse.env.Promise;
     var Strophe = converse.env.Strophe;

tests/runner.js

@@ -1,7 +1,154 @@
-/*global config */
+var config = {
+    baseUrl: '../',
+    paths: {
+        "console-reporter":         "tests/console-reporter",
+
+        "IPv6":                     "node_modules/urijs/src/IPv6",
+        "SecondLevelDomains":       "node_modules/urijs/src/SecondLevelDomains",
+        "almond":                   "node_modules/almond/almond",
+        "awesomplete":              "node_modules/awesomplete-avoid-xss/awesomplete",
+        "babel":                    "node_modules/requirejs-babel/babel-5.8.34.min",
+        "backbone":                 "node_modules/backbone/backbone",
+        "backbone.browserStorage":  "node_modules/backbone.browserStorage/backbone.browserStorage",
+        "backbone.nativeview":      "node_modules/backbone.nativeview/backbone.nativeview",
+        "backbone.noconflict":      "src/backbone.noconflict",
+        "backbone.orderedlistview": "node_modules/backbone.overview/dist/backbone.orderedlistview",
+        "backbone.overview":        "node_modules/backbone.overview/dist/backbone.overview",
+        "backbone.vdomview":        "node_modules/backbone.vdomview/dist/backbone.vdomview",
+        "bootstrap":                "node_modules/bootstrap.native/dist/bootstrap-native-v4",
+        "emojione":                 "node_modules/emojione/lib/js/emojione",
+        "es6-promise":              "node_modules/es6-promise/dist/es6-promise.auto",
+        "eventemitter":             "node_modules/otr/build/dep/eventemitter",
+        "filesize":                 "node_modules/filesize/lib/filesize",
+        "form-utils":               "src/utils/form",
+        "i18n":                     "src/i18n",
+        "jed":                      "node_modules/jed/jed",
+        "jquery":                   "src/jquery-stub",
+        "lodash":                   "node_modules/lodash/lodash",
+        "lodash.converter":         "3rdparty/lodash.fp",
+        "lodash.fp":                "src/lodash.fp",
+        "lodash.noconflict":        "src/lodash.noconflict",
+        "message-utils":            "src/utils/message",
+        "muc-utils":                "src/utils/muc",
+        "pluggable":                "node_modules/pluggable.js/dist/pluggable",
+        "polyfill":                 "src/polyfill",
+        "punycode":                 "node_modules/urijs/src/punycode",
+        "sizzle":                   "node_modules/sizzle/dist/sizzle",
+        "snabbdom":                 "node_modules/snabbdom/dist/snabbdom",
+        "snabbdom-attributes":      "node_modules/snabbdom/dist/snabbdom-attributes",
+        "snabbdom-class":           "node_modules/snabbdom/dist/snabbdom-class",
+        "snabbdom-dataset":         "node_modules/snabbdom/dist/snabbdom-dataset",
+        "snabbdom-eventlisteners":  "node_modules/snabbdom/dist/snabbdom-eventlisteners",
+        "snabbdom-props":           "node_modules/snabbdom/dist/snabbdom-props",
+        "snabbdom-style":           "node_modules/snabbdom/dist/snabbdom-style",
+        "strophe":                  "node_modules/strophe.js/strophe",
+        "strophe.ping":             "node_modules/strophejs-plugin-ping/strophe.ping",
+        "strophe.rsm":              "node_modules/strophejs-plugin-rsm/strophe.rsm",
+        "text":                     "node_modules/text/text",
+        "tovnode":                  "node_modules/snabbdom/dist/tovnode",
+        "tpl":                      "node_modules/lodash-template-loader/loader",
+        "underscore":               "src/underscore-shim",
+        "uri":                      "node_modules/urijs/src/URI",
+        "utils":                    "src/utils/core",
+        "vdom-parser":              "node_modules/vdom-parser/dist",
+        "xss":                      "node_modules/xss/dist/xss",
+        "xss.noconflict":           "src/xss.noconflict",
+
+        // Converse
+        "converse":                 "src/converse",
+
+        "converse-bookmarks":       "src/converse-bookmarks",
+        "converse-chatboxes":       "src/converse-chatboxes",
+        "converse-caps":           "src/converse-caps",
+        "converse-chatview":        "src/converse-chatview",
+        "converse-controlbox":      "src/converse-controlbox",
+        "converse-core":            "src/converse-core",
+        "converse-disco":           "src/converse-disco",
+        "converse-dragresize":      "src/converse-dragresize",
+        "converse-embedded":        "src/converse-embedded",
+        "converse-fullscreen":      "src/converse-fullscreen",
+        "converse-headline":        "src/converse-headline",
+        "converse-mam":             "src/converse-mam",
+        "converse-message-view":    "src/converse-message-view",
+        "converse-minimize":        "src/converse-minimize",
+        "converse-modal":           "src/converse-modal",
+        "converse-muc":             "src/converse-muc",
+        "converse-muc-views":       "src/converse-muc-views",
+        "converse-notification":    "src/converse-notification",
+        "converse-otr":             "src/converse-otr",
+        "converse-ping":            "src/converse-ping",
+        "converse-profile":         "src/converse-profile",
+        "converse-register":        "src/converse-register",
+        "converse-roomslist":       "src/converse-roomslist",
+        "converse-roster":          "src/converse-roster",
+        "converse-rosterview":      "src/converse-rosterview",
+        "converse-singleton":       "src/converse-singleton",
+        "converse-vcard":           "src/converse-vcard",
+
+        // Off-the-record-encryption
+        // "bigint":               "node_modules/otr/build/dep/bigint",
+        "bigint":               "3rdparty/bigint",
+        "crypto":               "node_modules/otr/build/dep/crypto",
+        "salsa20":              "node_modules/otr/build/dep/salsa20",
+        "otr":                  "node_modules/otr/build/otr",
+    },
+
+    packages: [{
+        'name': 'moment',
+        'location': 'node_modules/moment',
+        'main': 'moment'
+    }],
+
+    map: {
+        // '*' means all modules will get the '*.noconflict' version
+        // as their dependency.
+        '*': {
+            'backbone': 'backbone.noconflict',
+            'lodash': 'lodash.noconflict'
+         },
+        // '*.noconflict' wants the real module
+        // If this line was not here, there would
+        // be an unresolvable cyclic dependency.
+        'backbone.noconflict': { 'backbone': 'backbone' },
+        'lodash.noconflict': { 'lodash': 'lodash' }
+    },
+
+    lodashLoader: {
+        // Configuration for requirejs-tpl
+        // Use Mustache style syntax for variable interpolation
+        root: "src/templates/",
+        templateSettings: {
+            "escape": /\{\{\{([\s\S]+?)\}\}\}/g,
+            "evaluate": /\{\[([\s\S]+?)\]\}/g,
+            "interpolate": /\{\{([\s\S]+?)\}\}/g,
+            // By default, template places the values from your data in the
+            // local scope via the with statement. However, you can specify
+            // a single variable name with the variable setting. This can
+            // significantly improve the speed at which a template is able
+            // to render.
+            "variable": 'o'
+        }
+    },
+
+    // define module dependencies for modules not using define
+    shim: {
+        'backbone.orderedlistview': { deps: ['backbone.nativeview'] },
+        'backbone.overview':        { deps: ['backbone.nativeview'] },
+        'backbone.vdomview':        { deps: ['backbone.nativeview'] },
+        'awesomplete':              { exports: 'Awesomplete'},
+        'emojione':                 { exports: 'emojione'},
+        'xss':  {
+            'init': function (xss_noconflict) {
+                return {
+                    filterXSS: window.filterXSS,
+                    filterCSS: window.filterCSS
+                }
+            }
+        }
+    }
+};
 
 // Extra test dependencies
-config.baseUrl = '../';
 config.paths.jquery = "node_modules/jquery/dist/jquery";
 config.paths.mock = "tests/mock";
 config.paths['wait-until-promise'] = "node_modules/wait-until-promise/index";
@@ -11,7 +158,6 @@ config.paths.transcripts = "converse-logs/converse-logs";
 config.paths["jasmine-core"] = "node_modules/jasmine-core/lib/jasmine-core/jasmine";
 config.paths.jasmine = "node_modules/jasmine-core/lib/jasmine-core/boot";
 config.paths["jasmine-console"] = "node_modules/jasmine-core/lib/console/console";
-config.paths["console-reporter"] = "tests/console-reporter";
 config.paths["jasmine-html"] = "node_modules/jasmine-core/lib/jasmine-core/jasmine-html";
 config.shim.jasmine = {
     exports: 'window.jasmineRequire'

tests/utils.js

@@ -1,12 +1,12 @@
 (function (root, factory) {
-    define(['converse', 'es6-promise',  'mock', 'wait-until-promise'], factory);
-}(this, function (converse_api, Promise, mock, waitUntilPromise) {
-    var _ = converse_api.env._;
-    var $msg = converse_api.env.$msg;
-    var $pres = converse_api.env.$pres;
-    var $iq = converse_api.env.$iq;
-    var Strophe = converse_api.env.Strophe;
-    var u = converse_api.env.utils;
+    define(['es6-promise',  'mock', 'wait-until-promise'], factory);
+}(this, function (Promise, mock, waitUntilPromise) {
+    var _ = converse.env._;
+    var $msg = converse.env.$msg;
+    var $pres = converse.env.$pres;
+    var $iq = converse.env.$iq;
+    var Strophe = converse.env.Strophe;
+    var u = converse.env.utils;
     var utils = {};
 
     if (typeof window.Promise === 'undefined') {