From fe5bdfa57e3da329068f5521cb4872c6fa39e5a5 Mon Sep 17 00:00:00 2001
From: Brian Mann <brian@backbonerails.com>
Date: Sat, 27 May 2017 14:36:44 -0400
Subject: [PATCH] run the server integration tests, cleanup package scripts,
 echo helpful errors

---
 circle.yml                               |  9 ++++++++-
 packages/server/package.json             | 20 ++++++++------------
 packages/server/test/support/helpers/run | 15 +++++++++++++++
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/circle.yml b/circle.yml
index 54d0be9d14..bd065fc011 100644
--- a/circle.yml
+++ b/circle.yml
@@ -159,7 +159,14 @@ jobs:
           name: Server unit tests
           command: |
             if [ $CIRCLE_NODE_INDEX == 0 ]; then
-              npm run all test -- --package server
+              npm run all test-unit -- --package server
+            fi
+
+      - run:
+          name: Server integration tests
+          command: |
+            if [ $CIRCLE_NODE_INDEX == 0 ]; then
+              npm run all test-integration -- --package server
             fi
       #
       # things to run in the 2nd CI container
diff --git a/packages/server/package.json b/packages/server/package.json
index 68fec5e8c4..04e3d90f6f 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -4,7 +4,6 @@
   "version": "0.19.2",
   "description": "Javascript Test Engine",
   "main": "index.js",
-  "single-instance": false,
   "scripts": {
     "start": "node index.js",
     "server": "node index.js --mode server",
@@ -13,17 +12,14 @@
     "clean-deps": "rm -rf node_modules",
     "deploy": "gulp deploy",
     "release": "gulp release",
-    "test": "npm run test-unit-once",
-    "test-watch": "./test/support/helpers/watch test-once",
-    "test-once": "./test/support/helpers/run",
-    "test-unit": "./test/support/helpers/watch test-unit-once",
-    "test-unit-once": "./test/support/helpers/run test/unit",
-    "test-integration": "./test/support/helpers/watch test-integration-once",
-    "test-integration-once": "./test/support/helpers/run test/integration",
-    "test-e2e": "./test/support/helpers/watch test-e2e-once",
-    "test-e2e-once": "./test/support/helpers/run test/e2e",
-    "test-e2e-chrome": "./test/support/helpers/watch test-e2e-chrome-once",
-    "test-e2e-chrome-once": "./test/support/helpers/run e2e chrome",
+    "test": "./test/support/helpers/run",
+    "test-watch": "./test/support/helpers/watch test",
+    "test-unit": "./test/support/helpers/run test/unit",
+    "test-unit-watch": "./test/support/helpers/watch test-unit",
+    "test-integration": "./test/support/helpers/run test/integration",
+    "test-integration-watch": "./test/support/helpers/watch test-integration",
+    "test-e2e": "./test/support/helpers/run test/e2e",
+    "test-e2e-chrome": "./test/support/helpers/run test/e2e chrome",
     "test-cov": "NODE_COVERAGE=true NODE_ENV=test CYPRESS_ENV=test BLUEBIRD_DEBUG=1 xvfb-maybe istanbul cover node_modules/.bin/_mocha -- --opts ./test/support/mocha.opts",
     "test-cov-process": "NODE_COVERAGE=true NODE_ENV=test CYPRESS_ENV=test BLUEBIRD_DEBUG=1 istanbul cover --include-pid",
     "test-debug": "NODE_ENV=test NODE_DEBUG=request CYPRESS_ENV=test BLUEBIRD_DEBUG=1 DEBUG=nock.*,-nock.common,socket.io:* node-debug --hidden='(node_modules|bower_components)' --no-preload _mocha --opts test/support/mocha.opts --watch",
diff --git a/packages/server/test/support/helpers/run b/packages/server/test/support/helpers/run
index 0fece864a0..5ee2cc0120 100755
--- a/packages/server/test/support/helpers/run
+++ b/packages/server/test/support/helpers/run
@@ -1,6 +1,21 @@
 SPEC="$1"
 BROWSER="$2"
 
+if [ "$SPEC" == '' ]; then
+  echo 'Error: A path to a spec file must be specified!'
+  echo ''
+  echo 'It should look something like this:'
+  echo ''
+  echo '  $ npm test ./test/unit/api_spec.coffee'
+  echo ''
+  echo 'If you want to run all a specific group of tests:'
+  echo ''
+  echo '  $ npm run test-unit'
+  echo '  $ npm run test-integration'
+  echo ''
+  exit 1
+fi
+
 CYPRESS_DEBUG=true \
 NODE_ENV=test \
 NODE_DEBUG=request \