Fix: Detaching node element surrounded by text elements now merges these text element...

[fnpeditor.git] / tests / main.js

diff --git a/tests/main.js b/tests/main.js
index 9614d72..cc20549 100644 (file)
--- a/tests/main.js
+++ b/tests/main.js
@@ -1,30 +1,38 @@
-(function() {\r
-\r
-    mocha.setup('tdd');\r
-\r
-    var tests = Object.keys(window.__karma__.files).filter(function (file) {\r
-      return /\.test\.js$/.test(file);\r
-    });\r
-\r
-    require({\r
-      baseUrl: '/base/',\r
-      deps: tests,\r
-      callback: window.__karma__.start,\r
-        shim: {\r
-            'libs/jquery-1.9.1.min': {\r
-                exports: '$',\r
-            },\r
-            'libs/underscore-min': {\r
-                exports: '_'\r
-            },\r
-            'libs/bootstrap/js/bootstrap.min': {\r
-                deps: ['libs/jquery-1.9.1.min']\r
-            },\r
-            'libs/backbone-min': {\r
-                exports: 'Backbone',\r
-                deps: ['libs/jquery-1.9.1.min', 'libs/underscore-min']\r
-            }\r
-        }\r
-    });\r
-\r
+(function() {
+
+    mocha.setup('bdd');
+
+    var tests = Object.keys(window.__karma__.files).filter(function (file) {
+      return /\.test3\.js$/.test(file);
+    });
+
+    require({
+      baseUrl: '/base/',
+      deps: tests,
+      callback: window.__karma__.start,
+        shim: {
+            'libs/jquery-1.9.1.min': {
+                exports: '$',
+            },
+            'libs/underscore-min': {
+                exports: '_'
+            },
+            'libs/bootstrap/js/bootstrap.min': {
+                deps: ['libs/jquery-1.9.1.min']
+            },
+            'libs/backbone-min': {
+                exports: 'Backbone',
+                deps: ['libs/jquery-1.9.1.min', 'libs/underscore-min']
+            },
+            'libs/sinon-1.7.3': {
+                exports: 'sinon'
+            }
+        },
+        map: {
+            '*': {
+                'libs/sinon': 'libs/sinon-1.7.3'
+            }
+        }
+    });
+
 })();
\ No newline at end of file