testing wip - exposing chai.assert

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

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

   'libs/chai.js',\r
   'libsjquery-1.9.1.min.js',\r
   'libs/chai.js',\r
   'libsjquery-1.9.1.min.js',\r

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

   'modules/documentCanvas/tests/tests_transform.js'\r
   \r
 ];\r
   'modules/documentCanvas/tests/tests_transform.js'\r
   \r
 ];\r

diff --git a/modules/documentCanvas/tests/tests_transform.js b/modules/documentCanvas/tests/tests_transform.js
index 6d83e98..b693e12 100644 (file)
--- a/modules/documentCanvas/tests/tests_transform.js
+++ b/modules/documentCanvas/tests/tests_transform.js
@@ -1,7 +1,7 @@
 suite('Transform', function() {\r
 \r
     test('test1', function() {\r
 suite('Transform', function() {\r
 \r
     test('test1', function() {\r

-        chai.assert.ok(true);\r
+        assert.ok(true);\r

     });\r
 \r
 });
\ No newline at end of file
     });\r
 \r
 });
\ No newline at end of file

diff --git a/tests/conf.js b/tests/conf.js
new file mode 100644 (file)
index 0000000..431acb7
--- /dev/null
+++ b/tests/conf.js
@@ -0,0 +1,3 @@
+mocha.setup('tdd');\r
+\r
+var assert = chai.assert;
\ No newline at end of file

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