test: fix running on windows (#1371)

vuejs · Sep 1, 2018 · 0a04c46 · 0a04c46
1 parent 7558cc2
commit 0a04c46
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
     "test": "npm run lint && npm run test:types && npm run test:unit && npm run test:ssr && npm run test:e2e",
     "test:unit": "rollup -c build/rollup.dev.config.js && jasmine JASMINE_CONFIG_PATH=test/unit/jasmine.json",
     "test:e2e": "node test/e2e/runner.js",
-    "test:ssr": "rollup -c build/rollup.dev.config.js && VUE_ENV=server jasmine JASMINE_CONFIG_PATH=test/unit/jasmine.json",
+    "test:ssr": "rollup -c build/rollup.dev.config.js && cross-env VUE_ENV=server jasmine JASMINE_CONFIG_PATH=test/unit/jasmine.json",
     "test:types": "tsc -p types/test",
     "release": "bash build/release.sh",
     "docs": "vuepress dev docs",
@@ -45,6 +45,7 @@
     "babel-polyfill": "^6.22.0",
     "babel-preset-env": "^1.5.1",
     "chromedriver": "^2.32.3",
+    "cross-env": "^5.2.0",
     "cross-spawn": "^5.0.1",
     "css-loader": "^0.28.7",
     "eslint": "^3.19.0",

diff --git a/test/e2e/nightwatch.config.js b/test/e2e/nightwatch.config.js
@@ -40,7 +40,8 @@ module.exports = {
       'desiredCapabilities': {
         'browserName': 'phantomjs',
         'javascriptEnabled': true,
-        'acceptSslCerts': true
+        'acceptSslCerts': true,
+        'phantomjs.binary.path': require('phantomjs-prebuilt').path
       }
     }
   }