Skip to content

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

Fixed paths in tests_main.js and tests.html

parent d49bb253
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 7 deletions
tests.html
View file @ fb9fc879
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
<head> <head>
<title>Converse.js Tests</title> <title>Converse.js Tests</title>
<meta name="description" content="Converse.js: Open Source Browser-Based Instant Messaging" /> <meta name="description" content="Converse.js: Open Source Browser-Based Instant Messaging" />
<link rel="shortcut icon" type="image/png" href="Libraries/jasmine-1.3.1/jasmine_favicon.png"> <link rel="shortcut icon" type="image/png" href="components/jasmine/images/jasmine_favicon.png">
<link rel="stylesheet" type="text/css" href="Libraries/jasmine-1.3.1/jasmine.css"> <link rel="stylesheet" type="text/css" href="components/jasmine/src/html/jasmine.css">
<link rel="stylesheet" type="text/css" media="screen" href="stylesheets/stylesheet.css"> <link rel="stylesheet" type="text/css" media="screen" href="stylesheets/stylesheet.css">
<link rel="stylesheet" type="text/css" media="screen" href="converse.css"> <link rel="stylesheet" type="text/css" media="screen" href="converse.css">
<script data-main="tests_main" src="Libraries/require-jquery.js"></script> <script data-main="tests_main" src="components/requirejs/require.js"></script>
</head> </head>
<body> <body>
......
tests_main.js
View file @ fb9fc879
require.config({ require.config({
paths: { paths: {
"jasmine": "Libraries/jasmine-1.3.1/jasmine", "jquery": "components/jquery/jquery",
"jasmine-html": "Libraries/jasmine-1.3.1/jasmine-html", "locales": "locale/locales",
"sjcl": "components/sjcl/sjcl",
"tinysort": "components/tinysort/src/jquery.tinysort",
"underscore": "components/underscore/underscore",
"backbone": "components/backbone/backbone",
"localstorage": "components/backbone.localStorage/backbone.localStorage",
"strophe": "components/strophe/strophe",
"strophe.muc": "components/strophe.muc/index",
"strophe.roster": "components/strophe.roster/index",
"strophe.vcard": "components/strophe.vcard/index",
"strophe.disco": "components/strophe.disco/index",
// Extra test dependencies
"jasmine": "components/jasmine/lib/jasmine-core/jasmine",
"jasmine-html": "components/jasmine/lib/jasmine-core/jasmine-html",
"jasmine-console-reporter": "node_modules/jasmine-reporters/src/jasmine.console_reporter", "jasmine-console-reporter": "node_modules/jasmine-reporters/src/jasmine.console_reporter",
"jasmine-junit-reporter": "node_modules/jasmine-reporters/src/jasmine.junit_reporter" "jasmine-junit-reporter": "node_modules/jasmine-reporters/src/jasmine.junit_reporter"
}, },
// define module dependencies for modules not using define // define module dependencies for modules not using define
shim: { shim: {
'backbone': {
//These script dependencies should be loaded before loading
//backbone.js
deps: [
'underscore',
'jquery'
],
//Once loaded, use the global 'Backbone' as the
//module value.
exports: 'Backbone'
},
'tinysort': { deps: ['jquery'] },
'strophe': { deps: ['jquery'] },
'underscore': { exports: '_' },
'strophe.muc': { deps: ['strophe', 'jquery'] },
'strophe.roster': { deps: ['strophe'] },
'strophe.vcard': { deps: ['strophe'] },
'strophe.disco': { deps: ['strophe'] },
// Extra test dependencies
'jasmine-html': { 'jasmine-html': {
deps: ['jasmine'], deps: ['jasmine'],
exports: 'jasmine' exports: 'jasmine'
...@@ -22,7 +56,6 @@ require.config({ ...@@ -22,7 +56,6 @@ require.config({
} }
}); });
require([ require([
"jquery", "jquery",
"converse", "converse",
...@@ -59,7 +92,7 @@ require([ ...@@ -59,7 +92,7 @@ require([
jasmineEnv.specFilter = function(spec) { jasmineEnv.specFilter = function(spec) {
return htmlReporter.specFilter(spec); return htmlReporter.specFilter(spec);
}; };
jasmineEnv.updateInterval = 250; jasmineEnv.updateInterval = 0;
} }
jasmineEnv.execute(); jasmineEnv.execute();
}); });
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