From 2910a0ca2067aee9b747bb3c8776b97a8f248c25 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Tue, 18 Jun 2013 15:18:27 +0200 Subject: [PATCH] testing wip - exposing chai.assert --- karma.conf.js | 4 +++- modules/documentCanvas/tests/tests_transform.js | 2 +- tests/conf.js | 3 +++ tests/mocha.conf.js | 1 - 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 tests/conf.js delete mode 100644 tests/mocha.conf.js diff --git a/karma.conf.js b/karma.conf.js index ce49467..41ee13e 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -5,9 +5,11 @@ files = [ MOCHA_ADAPTER, /*REQUIRE, REQUIRE_ADAPTER*/ - 'tests/mocha.conf.js', + 'libs/chai.js', 'libsjquery-1.9.1.min.js', + + 'tests/conf.js', 'modules/documentCanvas/tests/tests_transform.js' ]; diff --git a/modules/documentCanvas/tests/tests_transform.js b/modules/documentCanvas/tests/tests_transform.js index 6d83e98..b693e12 100644 --- a/modules/documentCanvas/tests/tests_transform.js +++ b/modules/documentCanvas/tests/tests_transform.js @@ -1,7 +1,7 @@ suite('Transform', function() { test('test1', function() { - chai.assert.ok(true); + assert.ok(true); }); }); \ No newline at end of file diff --git a/tests/conf.js b/tests/conf.js new file mode 100644 index 0000000..431acb7 --- /dev/null +++ b/tests/conf.js @@ -0,0 +1,3 @@ +mocha.setup('tdd'); + +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 index 46e0b34..0000000 --- a/tests/mocha.conf.js +++ /dev/null @@ -1 +0,0 @@ -mocha.setup('tdd'); \ No newline at end of file -- 2.20.1