From: Tim Otten <totten@civicrm.org>
Date: Wed, 4 Mar 2015 00:28:10 +0000 (-0800)
Subject: CRM-16046 - Move karma.conf.js to default location
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=450ae8a9373c39c51ec8ac9dae23aa3237130cbe;p=civicrm-core.git

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 e1e064cd97..ef710fcefd 100644
--- 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 40ac68bcf4..8cf25ba2a2 100644
--- 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