Fix tests and added a workaround...
so that we can use require config in main.js also in the tests.
This commit is contained in:
JC Brand
parent
a4dd5a2a46
commit
d690704f93
@ -5111,6 +5111,9 @@
|
|||||||
// Initialization
|
// Initialization
|
||||||
// --------------
|
// --------------
|
||||||
// This is the end of the initialize method.
|
// This is the end of the initialize method.
|
||||||
|
if (settings.connection) {
|
||||||
|
this.connection = settings.connection;
|
||||||
|
}
|
||||||
this._initializePlugins();
|
this._initializePlugins();
|
||||||
this._initialize();
|
this._initialize();
|
||||||
this.registerGlobalEventHandlers();
|
this.registerGlobalEventHandlers();
|
||||||
|
|||||||
12
index.html
12
index.html
@ -12,8 +12,14 @@
|
|||||||
<link type="text/css" rel="stylesheet" media="screen" href="components/bootstrap/dist/css/bootstrap.min.css" />
|
<link type="text/css" rel="stylesheet" media="screen" href="components/bootstrap/dist/css/bootstrap.min.css" />
|
||||||
<link type="text/css" rel="stylesheet" media="screen" href="components/fontawesome/css/font-awesome.min.css" />
|
<link type="text/css" rel="stylesheet" media="screen" href="components/fontawesome/css/font-awesome.min.css" />
|
||||||
<link type="text/css" rel="stylesheet" media="screen" href="css/theme.css" />
|
<link type="text/css" rel="stylesheet" media="screen" href="css/theme.css" />
|
||||||
<link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
|
<link type="text/css" rel="stylesheet" media="screen" href="css/converse.min.css" />
|
||||||
<script data-main="main" src="components/requirejs/require.js"></script>
|
<!-- Only for development: <script data-main="main" src="components/requirejs/require.js"></script> -->
|
||||||
|
<![if gte IE 9]>
|
||||||
|
<script src="builds/converse.website.min.js"></script>
|
||||||
|
<![endif]>
|
||||||
|
<!--[if lt IE 9]>
|
||||||
|
<script src="builds/converse.website-no-otr.min.js"></script>
|
||||||
|
<![endif]-->
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body id="page-top" data-spy="scroll" data-target=".navbar-custom">
|
<body id="page-top" data-spy="scroll" data-target=".navbar-custom">
|
||||||
@ -254,7 +260,7 @@
|
|||||||
play_sounds: true,
|
play_sounds: true,
|
||||||
roster_groups: true,
|
roster_groups: true,
|
||||||
show_controlbox_by_default: true,
|
show_controlbox_by_default: true,
|
||||||
debug: true,
|
debug: false,
|
||||||
xhr_user_search: false
|
xhr_user_search: false
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
27
main.js
27
main.js
@ -1,3 +1,16 @@
|
|||||||
|
var config;
|
||||||
|
if (typeof(require) === 'undefined') {
|
||||||
|
/* XXX: Hack to work around r.js's stupid parsing.
|
||||||
|
* We want to save the configuration in a variable so that we can reuse it in
|
||||||
|
* tests/main.js.
|
||||||
|
*/
|
||||||
|
require = {
|
||||||
|
config: function (c) {
|
||||||
|
config = c;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
require.config({
|
require.config({
|
||||||
baseUrl: '.',
|
baseUrl: '.',
|
||||||
paths: {
|
paths: {
|
||||||
@ -79,10 +92,11 @@ require.config({
|
|||||||
"controlbox": "src/templates/controlbox",
|
"controlbox": "src/templates/controlbox",
|
||||||
"controlbox_toggle": "src/templates/controlbox_toggle",
|
"controlbox_toggle": "src/templates/controlbox_toggle",
|
||||||
"field": "src/templates/field",
|
"field": "src/templates/field",
|
||||||
"form_checkbox": "src/templates/form_checkbox",
|
|
||||||
"form_captcha": "src/templates/form_captcha",
|
"form_captcha": "src/templates/form_captcha",
|
||||||
|
"form_checkbox": "src/templates/form_checkbox",
|
||||||
"form_input": "src/templates/form_input",
|
"form_input": "src/templates/form_input",
|
||||||
"form_select": "src/templates/form_select",
|
"form_select": "src/templates/form_select",
|
||||||
|
"form_textarea": "src/templates/form_textarea",
|
||||||
"group_header": "src/templates/group_header",
|
"group_header": "src/templates/group_header",
|
||||||
"info": "src/templates/info",
|
"info": "src/templates/info",
|
||||||
"login_panel": "src/templates/login_panel",
|
"login_panel": "src/templates/login_panel",
|
||||||
@ -92,11 +106,11 @@ require.config({
|
|||||||
"occupant": "src/templates/occupant",
|
"occupant": "src/templates/occupant",
|
||||||
"pending_contact": "src/templates/pending_contact",
|
"pending_contact": "src/templates/pending_contact",
|
||||||
"pending_contacts": "src/templates/pending_contacts",
|
"pending_contacts": "src/templates/pending_contacts",
|
||||||
"requesting_contact": "src/templates/requesting_contact",
|
|
||||||
"requesting_contacts": "src/templates/requesting_contacts",
|
|
||||||
"register_panel": "src/templates/register_panel",
|
"register_panel": "src/templates/register_panel",
|
||||||
"register_tab": "src/templates/register_tab",
|
"register_tab": "src/templates/register_tab",
|
||||||
"registration_form": "src/templates/registration_form",
|
"registration_form": "src/templates/registration_form",
|
||||||
|
"requesting_contact": "src/templates/requesting_contact",
|
||||||
|
"requesting_contacts": "src/templates/requesting_contacts",
|
||||||
"room_description": "src/templates/room_description",
|
"room_description": "src/templates/room_description",
|
||||||
"room_item": "src/templates/room_item",
|
"room_item": "src/templates/room_item",
|
||||||
"room_panel": "src/templates/room_panel",
|
"room_panel": "src/templates/room_panel",
|
||||||
@ -107,8 +121,7 @@ require.config({
|
|||||||
"status_option": "src/templates/status_option",
|
"status_option": "src/templates/status_option",
|
||||||
"toggle_chats": "src/templates/toggle_chats",
|
"toggle_chats": "src/templates/toggle_chats",
|
||||||
"toolbar": "src/templates/toolbar",
|
"toolbar": "src/templates/toolbar",
|
||||||
"trimmed_chat": "src/templates/trimmed_chat",
|
"trimmed_chat": "src/templates/trimmed_chat"
|
||||||
"form_textarea": "src/templates/form_textarea"
|
|
||||||
},
|
},
|
||||||
|
|
||||||
map: {
|
map: {
|
||||||
@ -152,6 +165,10 @@ require.config({
|
|||||||
'strophe.vcard': { deps: ['strophe'] }
|
'strophe.vcard': { deps: ['strophe'] }
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (typeof(require) === 'function') {
|
||||||
|
require(config);
|
||||||
require(["converse"], function(converse) {
|
require(["converse"], function(converse) {
|
||||||
window.converse = converse;
|
window.converse = converse;
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
|||||||
149
tests/main.js
149
tests/main.js
@ -1,152 +1,3 @@
|
|||||||
config = {
|
|
||||||
baseUrl: '.',
|
|
||||||
paths: {
|
|
||||||
"backbone": "components/backbone/backbone",
|
|
||||||
"backbone.browserStorage": "components/backbone.browserStorage/backbone.browserStorage",
|
|
||||||
"backbone.overview": "components/backbone.overview/backbone.overview",
|
|
||||||
"bootstrap": "components/bootstrap/dist/js/bootstrap", // XXX: Only required for https://conversejs.org website
|
|
||||||
"bootstrapJS": "components/bootstrapJS/index", // XXX: Only required for https://conversejs.org website
|
|
||||||
"converse-dependencies": "src/deps-website",
|
|
||||||
"converse-templates": "src/templates",
|
|
||||||
"eventemitter": "components/otr/build/dep/eventemitter",
|
|
||||||
"jquery": "components/jquery/dist/jquery",
|
|
||||||
"jquery-private": "src/jquery-private",
|
|
||||||
"jquery.browser": "components/jquery.browser/index",
|
|
||||||
"jquery.easing": "components/jquery-easing-original/index", // XXX: Only required for https://conversejs.org website
|
|
||||||
"moment": "components/momentjs/moment",
|
|
||||||
"strophe": "components/strophe/strophe",
|
|
||||||
"strophe.disco": "components/strophejs-plugins/disco/strophe.disco",
|
|
||||||
"strophe.muc": "components/strophe.muc/index",
|
|
||||||
"strophe.roster": "src/strophe.roster",
|
|
||||||
"strophe.vcard": "components/strophejs-plugins/vcard/strophe.vcard",
|
|
||||||
"text": 'components/requirejs-text/text',
|
|
||||||
"tpl": 'components/requirejs-tpl-jcbrand/tpl',
|
|
||||||
"typeahead": "components/typeahead.js/index",
|
|
||||||
"underscore": "components/underscore/underscore",
|
|
||||||
"utils": "src/utils",
|
|
||||||
|
|
||||||
// Off-the-record-encryption
|
|
||||||
"bigint": "src/bigint",
|
|
||||||
"crypto": "src/crypto",
|
|
||||||
"crypto.aes": "components/otr/vendor/cryptojs/aes",
|
|
||||||
"crypto.cipher-core": "components/otr/vendor/cryptojs/cipher-core",
|
|
||||||
"crypto.core": "components/otr/vendor/cryptojs/core",
|
|
||||||
"crypto.enc-base64": "components/otr/vendor/cryptojs/enc-base64",
|
|
||||||
"crypto.evpkdf": "components/crypto-js-evanvosberg/src/evpkdf",
|
|
||||||
"crypto.hmac": "components/otr/vendor/cryptojs/hmac",
|
|
||||||
"crypto.md5": "components/crypto-js-evanvosberg/src/md5",
|
|
||||||
"crypto.mode-ctr": "components/otr/vendor/cryptojs/mode-ctr",
|
|
||||||
"crypto.pad-nopadding": "components/otr/vendor/cryptojs/pad-nopadding",
|
|
||||||
"crypto.sha1": "components/otr/vendor/cryptojs/sha1",
|
|
||||||
"crypto.sha256": "components/otr/vendor/cryptojs/sha256",
|
|
||||||
"salsa20": "components/otr/build/dep/salsa20",
|
|
||||||
"otr": "src/otr",
|
|
||||||
|
|
||||||
// Locales paths
|
|
||||||
"locales": "locale/locales",
|
|
||||||
"jed": "components/jed/jed",
|
|
||||||
"af": "locale/af/LC_MESSAGES/af",
|
|
||||||
"de": "locale/de/LC_MESSAGES/de",
|
|
||||||
"en": "locale/en/LC_MESSAGES/en",
|
|
||||||
"es": "locale/es/LC_MESSAGES/es",
|
|
||||||
"fr": "locale/fr/LC_MESSAGES/fr",
|
|
||||||
"he": "locale/he/LC_MESSAGES/he",
|
|
||||||
"hu": "locale/hu/LC_MESSAGES/hu",
|
|
||||||
"id": "locale/id/LC_MESSAGES/id",
|
|
||||||
"it": "locale/it/LC_MESSAGES/it",
|
|
||||||
"ja": "locale/ja/LC_MESSAGES/ja",
|
|
||||||
"nl": "locale/nl/LC_MESSAGES/nl",
|
|
||||||
"pt_BR": "locale/pt_BR/LC_MESSAGES/pt_BR",
|
|
||||||
"ru": "locale/ru/LC_MESSAGES/ru",
|
|
||||||
"zh": "locale/zh/LC_MESSAGES/zh",
|
|
||||||
|
|
||||||
// Templates
|
|
||||||
"action": "src/templates/action",
|
|
||||||
"add_contact_dropdown": "src/templates/add_contact_dropdown",
|
|
||||||
"add_contact_form": "src/templates/add_contact_form",
|
|
||||||
"change_status_message": "src/templates/change_status_message",
|
|
||||||
"chat_status": "src/templates/chat_status",
|
|
||||||
"chatarea": "src/templates/chatarea",
|
|
||||||
"chatbox": "src/templates/chatbox",
|
|
||||||
"chatroom": "src/templates/chatroom",
|
|
||||||
"chatroom_password_form": "src/templates/chatroom_password_form",
|
|
||||||
"chatroom_sidebar": "src/templates/chatroom_sidebar",
|
|
||||||
"chatrooms_tab": "src/templates/chatrooms_tab",
|
|
||||||
"chats_panel": "src/templates/chats_panel",
|
|
||||||
"choose_status": "src/templates/choose_status",
|
|
||||||
"contacts_panel": "src/templates/contacts_panel",
|
|
||||||
"contacts_tab": "src/templates/contacts_tab",
|
|
||||||
"controlbox": "src/templates/controlbox",
|
|
||||||
"controlbox_toggle": "src/templates/controlbox_toggle",
|
|
||||||
"field": "src/templates/field",
|
|
||||||
"form_checkbox": "src/templates/form_checkbox",
|
|
||||||
"form_input": "src/templates/form_input",
|
|
||||||
"form_select": "src/templates/form_select",
|
|
||||||
"group_header": "src/templates/group_header",
|
|
||||||
"info": "src/templates/info",
|
|
||||||
"login_panel": "src/templates/login_panel",
|
|
||||||
"login_tab": "src/templates/login_tab",
|
|
||||||
"message": "src/templates/message",
|
|
||||||
"new_day": "src/templates/new_day",
|
|
||||||
"occupant": "src/templates/occupant",
|
|
||||||
"pending_contact": "src/templates/pending_contact",
|
|
||||||
"pending_contacts": "src/templates/pending_contacts",
|
|
||||||
"requesting_contact": "src/templates/requesting_contact",
|
|
||||||
"requesting_contacts": "src/templates/requesting_contacts",
|
|
||||||
"room_description": "src/templates/room_description",
|
|
||||||
"room_item": "src/templates/room_item",
|
|
||||||
"room_panel": "src/templates/room_panel",
|
|
||||||
"roster": "src/templates/roster",
|
|
||||||
"roster_item": "src/templates/roster_item",
|
|
||||||
"search_contact": "src/templates/search_contact",
|
|
||||||
"select_option": "src/templates/select_option",
|
|
||||||
"status_option": "src/templates/status_option",
|
|
||||||
"toggle_chats": "src/templates/toggle_chats",
|
|
||||||
"toolbar": "src/templates/toolbar",
|
|
||||||
"trimmed_chat": "src/templates/trimmed_chat"
|
|
||||||
},
|
|
||||||
|
|
||||||
map: {
|
|
||||||
// '*' means all modules will get 'jquery-private'
|
|
||||||
// for their 'jquery' dependency.
|
|
||||||
'*': { 'jquery': 'jquery-private' },
|
|
||||||
// 'jquery-private' wants the real jQuery module
|
|
||||||
// though. If this line was not here, there would
|
|
||||||
// be an unresolvable cyclic dependency.
|
|
||||||
'jquery-private': { 'jquery': 'jquery' }
|
|
||||||
},
|
|
||||||
|
|
||||||
tpl: {
|
|
||||||
// Configuration for requirejs-tpl
|
|
||||||
// Use Mustache style syntax for variable interpolation
|
|
||||||
templateSettings: {
|
|
||||||
evaluate : /\{\[([\s\S]+?)\]\}/g,
|
|
||||||
interpolate : /\{\{([\s\S]+?)\}\}/g
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
// define module dependencies for modules not using define
|
|
||||||
shim: {
|
|
||||||
'underscore': { exports: '_' },
|
|
||||||
'crypto.aes': { deps: ['crypto.cipher-core'] },
|
|
||||||
'crypto.cipher-core': { deps: ['crypto.enc-base64', 'crypto.evpkdf'] },
|
|
||||||
'crypto.enc-base64': { deps: ['crypto.core'] },
|
|
||||||
'crypto.evpkdf': { deps: ['crypto.md5'] },
|
|
||||||
'crypto.hmac': { deps: ['crypto.core'] },
|
|
||||||
'crypto.md5': { deps: ['crypto.core'] },
|
|
||||||
'crypto.mode-ctr': { deps: ['crypto.cipher-core'] },
|
|
||||||
'crypto.pad-nopadding': { deps: ['crypto.cipher-core'] },
|
|
||||||
'crypto.sha1': { deps: ['crypto.core'] },
|
|
||||||
'crypto.sha256': { deps: ['crypto.core'] },
|
|
||||||
'bigint': { deps: ['crypto'] },
|
|
||||||
'strophe': { exports: 'Strophe' },
|
|
||||||
'strophe.disco': { deps: ['strophe'] },
|
|
||||||
'strophe.muc': { deps: ['strophe'] },
|
|
||||||
'strophe.roster': { deps: ['strophe'] },
|
|
||||||
'strophe.vcard': { deps: ['strophe'] }
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// Extra test dependencies
|
// Extra test dependencies
|
||||||
config.paths.mock = "tests/mock";
|
config.paths.mock = "tests/mock";
|
||||||
config.paths.test_utils = "tests/utils";
|
config.paths.test_utils = "tests/utils";
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user