Merge "selenium: Abstract test command behind 'npm run'" into REL1_31

diff --git a/package.json b/package.json
index a282d69..416a23e 100644 (file)
--- a/package.json
+++ b/package.json
@@ -5,7 +5,8 @@
     "qunit": "grunt qunit",
     "doc": "jsduck",
     "postdoc": "grunt copy:jsduck",
-    "selenium": "./tests/selenium/selenium.sh"
+    "selenium": "./tests/selenium/selenium.sh",
+    "selenium-test": "grunt webdriver:test"
   },
   "devDependencies": {
     "bluebird": "3.5.1",

diff --git a/tests/selenium/selenium.sh b/tests/selenium/selenium.sh
index 519b7be..6b71019 100755 (executable)
--- a/tests/selenium/selenium.sh
+++ b/tests/selenium/selenium.sh
@@ -6,4 +6,4 @@ function kill_chromedriver() {
     killall chromedriver > /dev/null
 }
 trap kill_chromedriver EXIT
-./node_modules/.bin/grunt webdriver:test
+npm run selenium-test