Merge branch 'objects' implementing canvas objects extending ability

[fnpeditor.git] / karma.conf.js

diff --git a/karma.conf.js b/karma.conf.js
index ce49467..3921f0b 100644 (file)
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -1,36 +1,37 @@
-basePath = '';\r
-\r
-files = [\r
-  MOCHA,\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
-  \r
-];\r
-\r
-reporters = ['progress'];\r
-\r
-port = 9876;\r
-runnerPort = 9100;\r
-captureTimeout = 60000;\r
-\r
-autoWatch = true;\r
-singleRun = false;\r
-\r
-browsers = ['PhantomJS'];\r
-\r
-colors = true;\r
-logLevel = LOG_INFO;\r
-\r
-\r
-\r
-\r
-\r
-\r
-\r
-\r
-\r
+basePath = '';
+
+files = [
+  MOCHA,
+  MOCHA_ADAPTER,
+  REQUIRE,
+  REQUIRE_ADAPTER,
+  
+  'libs/vkbeautify.js',
+  {pattern: 'libs/*.js', included: false},
+  {pattern: 'src/**/*.js', included: false},
+  {pattern: 'src/**/*.html', included: false},
+  'tests/main.js',
+];
+
+reporters = ['progress'];
+
+port = 9876;
+runnerPort = 9100;
+captureTimeout = 60000;
+
+autoWatch = true;
+singleRun = false;
+
+browsers = ['PhantomJS'];
+
+colors = true;
+logLevel = LOG_INFO;
+
+
+
+
+
+
+
+
+