move jsTestDriver.conf into config/ directory

diff --git a/README.md b/README.md
index 46445ed..e87796f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -116,7 +116,7 @@ fetch the changes and merge them into your project with git.
         partial1.html
         partial2.html
 
-    jsTestDriver.conf   --> config file for JsTestDriver
+    config/jsTestDriver.conf    --> config file for JsTestDriver
 
     logs/               --> JSTD and other logs go here (git-ignored)
 

diff --git a/config/jsTestDriver.conf b/config/jsTestDriver.conf
new file mode 100644 (file)
index 0000000..2882cbc
--- /dev/null
+++ b/config/jsTestDriver.conf
@@ -0,0 +1,12 @@
+server: http://localhost:9876
+
+load:
+  - test/lib/jasmine/jasmine.js
+  - test/lib/jasmine-jstd-adapter/JasmineAdapter.js
+  - app/lib/angular/angular.js
+  - test/lib/angular/angular-mocks.js
+  - app/js/*.js
+  - test/unit/*.js
+
+exclude:
+

diff --git a/jsTestDriver.conf b/jsTestDriver.conf
deleted file mode 100644 (file)
index 2882cbc..0000000
--- a/jsTestDriver.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-server: http://localhost:9876
-
-load:
-  - test/lib/jasmine/jasmine.js
-  - test/lib/jasmine-jstd-adapter/JasmineAdapter.js
-  - app/lib/angular/angular.js
-  - test/lib/angular/angular-mocks.js
-  - app/js/*.js
-  - test/unit/*.js
-
-exclude:
-

diff --git a/scripts/test-server.sh b/scripts/test-server.sh
index e332817..05a54de 100755 (executable)
--- a/scripts/test-server.sh
+++ b/scripts/test-server.sh
@@ -9,4 +9,4 @@ echo "Please open the url above and capture one or more browsers."
 echo ""
 echo "For more info please see: http://code.google.com/p/js-test-driver/"
 
-java -jar "$base_dir/../test/lib/jstestdriver/JsTestDriver.jar" --port $port --browserTimeout 20000
+java -jar "$base_dir/../test/lib/jstestdriver/JsTestDriver.jar" --port $port --browserTimeout 20000 --config "$base_dir/../config/jsTestDriver.conf" --basePath "$base_dir/.."

diff --git a/scripts/test.sh b/scripts/test.sh
index e235ab4..983eaa0 100755 (executable)
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -7,4 +7,4 @@ if [[ $tests = "" ]]; then
   tests="all"
 fi
 
-java -jar "$base_dir/../test/lib/jstestdriver/JsTestDriver.jar" --config "$base_dir/../jsTestDriver.conf" --tests "$tests"
+java -jar "$base_dir/../test/lib/jstestdriver/JsTestDriver.jar" --config "$base_dir/../config/jsTestDriver.conf" --basePath "$base_dir/.."  --tests "$tests"