CRM-16046 - Move karma.conf.js to default location

This allows one to call "karma start" without specifying the name of the config file.

diff --git a/tests/karma.conf.js b/karma.conf.js
similarity index 98%
rename from tests/karma.conf.js
rename to karma.conf.js
index e1e064cd977dc116942f826dd6d9d52be14ebbbf..ef710fcefd35c08b2cd757074091d1e526f0f789 100644 (file)
--- a/tests/karma.conf.js
+++ b/karma.conf.js
@@ -1,7 +1,6 @@
 module.exports = function(config) {
   config.set({
     autoWatch: true,
-    basePath: '..',
     browsers: ['PhantomJS'],
     exclude: [
     ],

diff --git a/tools/scripts/npm/test.sh b/tools/scripts/npm/test.sh
index 40ac68bcf48461ed00e3ffb43db53266771f159a..8cf25ba2a29d274a2485ed22b531e5faef5b9224 100644 (file)
--- a/tools/scripts/npm/test.sh
+++ b/tools/scripts/npm/test.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 if which node_modules/karma/bin/karma >> /dev/null; then
-  node node_modules/karma/bin/karma start tests/karma.conf.js
+  node node_modules/karma/bin/karma start
 elif which karma >> /dev/null ; then
-  karma start tests/karma.conf.js
+  karma start
 else
   echo "ERROR: Failed to find karma"
   exit 1