Merge pull request #29 from FormidableLabs/chore-refactor-checks

Chore refactor checks
FormidableLabs · Apr 14, 2015 · 98e5dbe · 98e5dbe
2 parents 4cd2516 + 661ff13
commit 98e5dbe
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 19 deletions.
diff --git a/INSTALL.md b/INSTALL.md
@@ -86,11 +86,8 @@ If the above steps completed without any errors, you should be able to run the
 internal `gulp` task runner checks to verify everything works:
 
 ```sh
-# Mac/Linux
+# Mac/Linux/Windows
 $ npm run-script check
-
-# Windows
-$ npm run-script check-win
 ```
 
 

diff --git a/README.md b/README.md
@@ -42,12 +42,7 @@ See our [installation instructions](./INSTALL.md). Here's a `tl;dr` summary:
 $ git clone https://github.com/FormidableLabs/full-stack-testing.git
 $ cd full-stack-testing
 $ npm install
-
-# Mac/Linux
 $ npm run-script check
-
-# Windows
-$ npm run-script check-win
 ```
 
 ## Tests

diff --git a/appveyor.yml b/appveyor.yml
@@ -6,8 +6,8 @@ environment:
 # Get the latest stable version of Node 0.STABLE.latest
 install:
   - ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version)
-  - npm install
   - npm -g install npm@next
+  - npm install
 
 build: off
 
@@ -17,6 +17,6 @@ test_script:
   - npm --version
   # Build and test.
   - npm run-script build
-  - npm run-script check-win
+  - npm run-script check
   - node_modules\.bin\gulp build:all
   - node_modules\.bin\gulp check:ci:win
diff --git a/gulpfile.js b/gulpfile.js
@@ -122,7 +122,9 @@ gulp.task("jscs", function () {
 // Tests: Client
 // ----------------------------------------------------------------------------
 // Use `node_modules` Phantom
-process.env.PHANTOMJS_BIN = "./node_modules/.bin/phantomjs";
+process.env.PHANTOMJS_BIN = process.platform === "win32" ?
+  "node_modules/phantomjs/lib/phantom/phantomjs.exe" :
+  "node_modules/.bin/phantomjs";
 
 // TODO[RYAN]: Hook up Sauce Labs for everything in browser matrix.
 //
@@ -170,14 +172,17 @@ gulp.task("karma:fast", _karmaFast);
 gulp.task("karma:ci:linux", _karma(KARMA_COV, {
   browsers: ["PhantomJS", "Firefox"]
 }));
-gulp.task("karma:win", _karma(KARMA_COV, {
-  browsers: ["IE"]
+gulp.task("karma:ci:win", _karma(KARMA_COV, {
+  browsers: ["PhantomJS", "IE"]
+}));
+gulp.task("karma:win-all", _karma({
+  browsers: ["PhantomJS", "Chrome", "Firefox", "IE"]
 }));
 gulp.task("karma:all", _karmaAll);
 
 gulp.task("test:frontend", ["clean:coverage:client"], _karmaFast);
 gulp.task("test:frontend:ci:linux", ["karma:ci:linux"]);
-gulp.task("test:frontend:win", ["karma:win"]);
+gulp.task("test:frontend:ci:win", ["karma:ci:win"]);
 gulp.task("test:frontend:all", ["clean:coverage:client"], _karmaAll);
 
 // ----------------------------------------------------------------------------
@@ -214,7 +219,7 @@ gulp.task("test:backend", ["clean:coverage:server"], function (done) {
 
 gulp.task("test", ["test:backend", "test:frontend"]);
 gulp.task("test:ci:linux", ["test:backend", "test:frontend:ci:linux"]);
-gulp.task("test:win", ["test:backend", "test:frontend:win"]);
+gulp.task("test:ci:win", ["test:backend", "test:frontend:ci:win"]);
 gulp.task("test:all", ["test:backend", "test:frontend:all"]);
 
 // ----------------------------------------------------------------------------
@@ -223,12 +228,11 @@ gulp.task("test:all", ["test:backend", "test:frontend:all"]);
 // Dev
 gulp.task("check:base", ["jscs", "eslint"]);
 gulp.task("check", ["check:base", "test"]);
-gulp.task("check:win", ["check:base", "test:win"]);
 gulp.task("check:all", ["check:base", "test:all"]);
 
 // CI
 gulp.task("check:ci:linux", ["check:base", "test:ci:linux"]);
-gulp.task("check:ci:win", ["check:win"]);
+gulp.task("check:ci:win", ["check:base", "test:ci:win"]);
 
 // ----------------------------------------------------------------------------
 // Builders

diff --git a/package.json b/package.json
@@ -49,7 +49,6 @@
     "test-backend": "mocha --require test/server/setup.js --recursive test/server",
     "test": "npm run-script test-frontend && npm run-script test-backend",
     "check": "npm run-script build-all && npm run-script test && gulp check",
-    "check-win": "npm run-script build-all && npm run-script test && gulp check:win",
     "build": "webpack --config webpack.config.js",
     "build-test": "webpack --config webpack.config.test.js",
     "build-cov": "webpack --config webpack.config.coverage.js",