integration: canvas fixes

[fnpeditor.git] / tests / main.js

diff --git a/tests/main.js b/tests/main.js
index eb765ed..c3da0df 100644 (file)
--- a/tests/main.js
+++ b/tests/main.js
@@ -1,37 +1,51 @@
 (function() {
 
 (function() {
 

-    mocha.setup('tdd');
+    mocha.setup('bdd');

 
     var tests = Object.keys(window.__karma__.files).filter(function (file) {
 
     var tests = Object.keys(window.__karma__.files).filter(function (file) {

-      return /\.test\.js$/.test(file);
+      return (/\.test\.js$/).test(file);

     });
 
     require({
     });
 
     require({

-      baseUrl: '/base/',
+      baseUrl: '/base/src/editor',

       deps: tests,
       callback: window.__karma__.start,
       deps: tests,
       callback: window.__karma__.start,

+
+        paths: {
+            'fnpjs': '../fnpjs',
+            'libs': '../../libs',
+            'smartxml': '../smartxml',
+            'wlxml': '../wlxml'
+        },
+
+        map: {
+            '*':
+                {
+                    'libs/jquery': '../../libs/jquery-1.9.1.min',
+                    'libs/underscore': '../../libs/underscore-min',
+                    'libs/bootstrap': '../../libs/bootstrap/js/bootstrap.min',
+                    'libs/backbone': '../../libs/backbone-min',
+                    'libs/sinon': '../../libs/sinon-1.7.3'
+                }
+        },
+

         shim: {
         shim: {

-            'libs/jquery-1.9.1.min': {
+            '../../libs/jquery-1.9.1.min': {

                 exports: '$',
             },
                 exports: '$',
             },

-            'libs/underscore-min': {
+            '../../libs/underscore-min': {

                 exports: '_'
             },
                 exports: '_'
             },

-            'libs/bootstrap/js/bootstrap.min': {
-                deps: ['libs/jquery-1.9.1.min']
+            '../../libs/bootstrap/js/bootstrap.min': {
+                deps: ['libs/jquery']

             },
             },

-            'libs/backbone-min': {
+            '../../libs/backbone-min': {

                 exports: 'Backbone',
                 exports: 'Backbone',

-                deps: ['libs/jquery-1.9.1.min', 'libs/underscore-min']
+                deps: ['libs/jquery', 'libs/underscore']

             },
             },

-            'libs/sinon-1.7.3': {
+            '../../libs/sinon-1.7.3': {

                 exports: 'sinon'
             }
                 exports: 'sinon'
             }

-        },
-        map: {
-            '*': {
-                'libs/sinon': 'libs/sinon-1.7.3'
-            }

         }
     });
 
         }
     });