Home Explore Help
Register Sign In
im-changing.ru
/
converse.js
mirror of https://github.com/conversejs/converse.js.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Fixed paths in tests_main.js and tests.html

JC Brand 12 years ago
parent
d49bb25333
commit
fb9fc87952
2 changed files with 40 additions and 7 deletions
Split View Show Diff Stats
  1. 3 3
      tests.html
  2. 37 4
      tests_main.js

+ 3 - 3
tests.html
View File 

@@ -4,11 +4,11 @@
 
 <head>
 
     <title>Converse.js Tests</title>
 
     <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="stylesheet" type="text/css" href="Libraries/jasmine-1.3.1/jasmine.css">
 
+    <link rel="shortcut icon" type="image/png" href="components/jasmine/images/jasmine_favicon.png">
 
+    <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="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>
 
 
 <body>

+ 37 - 4
tests_main.js
View File 

@@ -1,12 +1,46 @@
 
+
 
 require.config({
 
     paths: {
 
-        "jasmine": "Libraries/jasmine-1.3.1/jasmine",
 
-        "jasmine-html": "Libraries/jasmine-1.3.1/jasmine-html",
 
+        "jquery": "components/jquery/jquery",
 
+        "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-junit-reporter": "node_modules/jasmine-reporters/src/jasmine.junit_reporter"
 
     },
 
+
 
     // define module dependencies for modules not using define
 
     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': {
 
             deps: ['jasmine'],
 
             exports: 'jasmine'
 
@@ -22,7 +56,6 @@ require.config({
 
     }
 
 });
 
 
-
 
 require([
 
     "jquery",
 
     "converse",
 
@@ -59,7 +92,7 @@ require([
 
         jasmineEnv.specFilter = function(spec) {
 
             return htmlReporter.specFilter(spec);
 
         };
 
-        jasmineEnv.updateInterval = 250;
 
+        jasmineEnv.updateInterval = 0;
 
     }
 
     jasmineEnv.execute();
 
 });