Merge pull request #3810 from jmchilton/qunit_touchup

Small improvements for driving Qunit tests.
galaxyproject · Mar 23, 2017 · 9e61aff · 9e61aff
2 parents 3a52d07 + a3b16bf
commit 9e61aff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/run_tests.sh b/run_tests.sh
@@ -235,11 +235,16 @@ exists() {
     type "$1" >/dev/null 2>/dev/null
 }
 
-ensure_grunt() {
+ensure_grunt_for_qunit() {
     if ! exists "grunt";
     then
-        echo "Grunt not on path, cannot run these tests."
-        exit 1
+        PATH="$PATH:./test/qunit/node_modules/grunt/bin"
+        export PATH
+        if ! exists "grunt";
+        then
+            echo "Grunt not on path, cannot run these tests."
+            exit 1
+        fi
     fi
 }
 
@@ -616,7 +621,7 @@ if [ "$driver" = "python" ]; then
     echo "Testing complete. HTML report is in \"$report_file\"." 1>&2
     exit ${exit_status}
 else
-    ensure_grunt
+    ensure_grunt_for_qunit
     if [ -n "$watch" ]; then
         grunt_task="watch"
     else

diff --git a/test/qunit/package.json b/test/qunit/package.json
@@ -5,7 +5,6 @@
     "grunt": "^1.0.1",
     "grunt-cli": "^1.2.0",
     "grunt-contrib-qunit": "^1.2.0",
-    "grunt-contrib-watch": "^1.0.0",
-    "phantomjs-prebuilt": "^2.1.13"
+    "grunt-contrib-watch": "^1.0.0"
   }
 }