Merge pull request scratchfoundation#691 from cwillisf/fix-tests-on-w…

…indows Fix tests on Windows
mitmedialab · Oct 11, 2017 · 59f2697 · 59f2697
2 parents b49408e + f528965
commit 59f2697
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -9,11 +9,11 @@
     "deploy": "touch build/.nojekyll && gh-pages -t -d build -m \"Build for $(git log --pretty=format:%H -n1)\"",
     "i18n:msgs": "node ./scripts/generate-locale-messages.js",
     "i18n:src": "babel src > tmp.js && rimraf tmp.js && ./scripts/build-i18n-source.js ./translations/messages/ ./translations/",
-    "lint": "eslint . --ext .js,.jsx",
     "start": "npm run i18n:msgs && webpack-dev-server",
-    "unit-test": "jest test/unit",
-    "integration-test": "jest --runInBand test/integration",
-    "test": "npm run lint && npm run unit-test && npm run build && npm run integration-test",
+    "test": "npm run test:lint && npm run build && npm run test:unit && npm run test:integration",
+    "test:integration": "jest --runInBand test[\\\\/]integration",
+    "test:lint": "eslint . --ext .js,.jsx",
+    "test:unit": "jest test[\\\\/]unit",
     "watch": "webpack --progress --colors --watch"
   },
   "author": "Massachusetts Institute of Technology",

diff --git a/test/helpers/selenium-helper.js b/test/helpers/selenium-helper.js
@@ -1,6 +1,7 @@
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 30000; // eslint-disable-line no-undef
 
 import bindAll from 'lodash.bindall';
+import 'chromedriver'; // register path
 import webdriver from 'selenium-webdriver';
 
 const {By, until} = webdriver;