change test job boundaries

Author: Kelly Selden

.travis.yml

@@ -11,8 +11,8 @@ cache:
   directories:
   - "$HOME/.npm"
 env:
-- TEST_COMMAND=test:bin
-- TEST_COMMAND=test:command
+- TEST_COMMAND=test:fast
+- TEST_COMMAND=test:slow
 - TEST_COMMAND=lint
 before_install:
 - npm config set spin false
@@ -37,8 +37,8 @@ jobs:
     env: TEST_COMMAND=lint
   include:
   - os: osx
-    node_js: node
-    env: TEST_COMMAND=test:both
+    node_js: '8'
+    env: TEST_COMMAND=test:slow
   - stage: Deploy
     cache: ignore
     env: ignore

appveyor.yml

@@ -1,7 +1,6 @@
 environment:
   matrix:
     - nodejs_version: "8"
-    - nodejs_version: ""
 
 branches:
   only:
@@ -32,7 +31,7 @@ install:
 test_script:
   - node --version
   - npm --version
-  - npm run test:both
+  - npm run test:slow
 
 # http://help.appveyor.com/discussions/questions/1310-delete-cache
 cache:

package.json

@@ -9,10 +9,9 @@
   },
   "scripts": {
     "start": "bin/ember-cli-update.js",
-    "test": "npm run test:both",
-    "test:both": "npm run test:bin && npm run test:command",
-    "test:bin": "cross-env DEBUG=ember-cli-update,boilerplate-update,git-diff-apply,git-fixtures mocha \"test/!(fixtures)/**/!(ember-addon)-test.js\"",
-    "test:command": "cross-env DEBUG=ember-cli-update,boilerplate-update,git-diff-apply,git-fixtures,ember-cli-addon-tests mocha test/acceptance/ember-addon-test.js",
+    "test": "cross-env DEBUG=ember-cli-update,boilerplate-update,git-diff-apply,git-fixtures,ember-cli-addon-tests mocha \"test/!(fixtures)/**/*-test.js\"",
+    "test:fast": "cross-env DEBUG=ember-cli-update,boilerplate-update,git-diff-apply,git-fixtures mocha \"test/+(integration|unit)/**/*-test.js\"",
+    "test:slow": "cross-env DEBUG=ember-cli-update,boilerplate-update,git-diff-apply,git-fixtures,ember-cli-addon-tests mocha test/acceptance/**/*-test.js",
     "posttest": "npm run lint",
     "prelint": "eslint --version",
     "lint": "eslint . --ext js,json",