testing wip: mocha.conf.js

diff --git a/karma.conf.js b/karma.conf.js
index a819cf5..ce49467 100644 (file)
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -5,6 +5,7 @@ files = [
   MOCHA_ADAPTER,\r
   /*REQUIRE,\r
   REQUIRE_ADAPTER*/\r
   MOCHA_ADAPTER,\r
   /*REQUIRE,\r
   REQUIRE_ADAPTER*/\r

+  'tests/mocha.conf.js',\r

   'libs/chai.js',\r
   'libsjquery-1.9.1.min.js',\r
   'modules/documentCanvas/tests/tests_transform.js'\r
   'libs/chai.js',\r
   'libsjquery-1.9.1.min.js',\r
   'modules/documentCanvas/tests/tests_transform.js'\r

diff --git a/modules/documentCanvas/tests/tests_transform.js b/modules/documentCanvas/tests/tests_transform.js
index 76b59a1..6d83e98 100644 (file)
--- a/modules/documentCanvas/tests/tests_transform.js
+++ b/modules/documentCanvas/tests/tests_transform.js
@@ -1,5 +1,3 @@
-mocha.setup('tdd');\r
-\r

 suite('Transform', function() {\r
 \r
     test('test1', function() {\r
 suite('Transform', function() {\r
 \r
     test('test1', function() {\r

diff --git a/tests/mocha.conf.js b/tests/mocha.conf.js
new file mode 100644 (file)
index 0000000..46e0b34
--- /dev/null
+++ b/tests/mocha.conf.js
@@ -0,0 +1 @@
+mocha.setup('tdd');
\ No newline at end of file