Fix CI

.npmignore

@@ -14,3 +14,8 @@
 bower.json
 ember-cli-build.js
 testem.js
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try

.travis.yml

@@ -4,24 +4,33 @@ node_js:
   - "6"
 
 sudo: false
+dist: trusty
+
+addons:
+  chrome: stable
 
 cache:
   yarn: true
 
 env:
-  # we recommend new addons test the current and previous LTS
-  # as well as latest stable release (bonus points to beta/canary)
-  - EMBER_TRY_SCENARIO=ember-1.13
-  - EMBER_TRY_SCENARIO=ember-lts-2.4
-  - EMBER_TRY_SCENARIO=2.6
-  - EMBER_TRY_SCENARIO=2.7
-  - EMBER_TRY_SCENARIO=ember-lts-2.8
-  - EMBER_TRY_SCENARIO=ember-lts-2.12
-  - EMBER_TRY_SCENARIO=ember-release
-  - EMBER_TRY_SCENARIO=ember-beta
-  - EMBER_TRY_SCENARIO=ember-canary
-  - EMBER_TRY_SCENARIO=ember-default
-  - EMBER_TRY_SCENARIO=fastboot-tests
+  global:
+    # See https://git.io/vdao3 for details.
+    - JOBS=1
+  matrix:
+    # we recommend new addons test the current and previous LTS
+    # as well as latest stable release (bonus points to beta/canary)
+    - EMBER_TRY_SCENARIO=ember-1.13
+    - EMBER_TRY_SCENARIO=ember-lts-2.4
+    - EMBER_TRY_SCENARIO=2.6
+    - EMBER_TRY_SCENARIO=2.7
+    - EMBER_TRY_SCENARIO=ember-lts-2.8
+    - EMBER_TRY_SCENARIO=ember-lts-2.12
+    - EMBER_TRY_SCENARIO=ember-lts-2.16
+    - EMBER_TRY_SCENARIO=ember-release
+    - EMBER_TRY_SCENARIO=ember-beta
+    - EMBER_TRY_SCENARIO=ember-canary
+    - EMBER_TRY_SCENARIO=ember-default
+    - EMBER_TRY_SCENARIO=fastboot-tests
 
 matrix:
   fast_finish: true
@@ -31,8 +40,6 @@ matrix:
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash
   - export PATH=$HOME/.yarn/bin:$PATH
-  - yarn global add phantomjs-prebuilt
-  - phantomjs --version
 
 install:
   - yarn install --no-lockfile --non-interactive

config/ember-try.js

@@ -1,11 +1,23 @@
 /* eslint-env node */
 module.exports = {
+  useYarn: true,
   scenarios: [
     {
       name: 'ember-1.13',
-      dependencies: {
-        'ember': '~1.13.13'
-      }
+      bower: {
+        dependencies: {
+          ember: '~1.13.0',
+          'ember-cli-shims': '0.0.6',
+          'ember-data': '~1.13.0',
+        },
+      },
+      npm: {
+        devDependencies: {
+          'ember-cli-shims': null,
+          'ember-data': '~1.13.0',
+          'ember-source': null,
+        },
+      },
     },
     {
       name: 'ember-lts-2.4',
@@ -25,15 +37,31 @@ module.exports = {
     },
     {
       name: '2.6',
-      dependencies: {
-        'ember': '~2.6.0'
-      }
+      bower: {
+        dependencies: {
+          ember: '~2.6.0',
+          'ember-cli-shims': null,
+        },
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null,
+        },
+      },
     },
     {
       name: '2.7',
-      dependencies: {
-        'ember': '~2.7.0'
-      }
+      bower: {
+        dependencies: {
+          ember: '~2.7.0',
+          'ember-cli-shims': null,
+        },
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null,
+        },
+      },
     },
     {
       name: 'ember-lts-2.8',
@@ -59,6 +87,14 @@ module.exports = {
         }
       }
     },
+    {
+      name: 'ember-lts-2.16',
+      npm: {
+        devDependencies: {
+          'ember-source': '~2.16.0'
+        }
+      }
+    },
     {
       name: 'ember-release',
       bower: {

package.json

@@ -13,26 +13,26 @@
   },
   "repository": "https://github.com/yapplabs/ember-wormhole.git",
   "scripts": {
-    "start": "ember server",
     "build": "ember build",
-    "test": "ember test"
+    "start": "ember serve",
+    "test": "ember try:each"
   },
   "dependencies": {
-    "ember-cli-babel": "^6.8.2",
+    "ember-cli-babel": "^6.10.0",
     "ember-cli-htmlbars": "^2.0.1"
   },
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
     "chai": "^4.1.2",
-    "ember-cli": "~2.16.2",
+    "ember-cli": "^2.17.0",
     "ember-cli-dependency-checker": "^2.0.0",
-    "ember-cli-eslint": "^4.0.0",
+    "ember-cli-eslint": "^4.2.1",
     "ember-cli-github-pages": "0.1.2",
     "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-qunit": "^4.0.0",
+    "ember-cli-qunit": "^4.1.1",
     "ember-cli-release": "^1.0.0-beta.2",
-    "ember-cli-shims": "^1.1.0",
+    "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^2.0.0",
     "ember-code-snippet": "^1.3.0",
@@ -41,7 +41,7 @@
     "ember-fastboot-addon-tests": "^0.4.0",
     "ember-load-initializers": "^1.0.0",
     "ember-resolver": "^4.0.0",
-    "ember-source": "~2.16.0",
+    "ember-source": "~2.17.0",
     "loader.js": "^4.2.3"
   },
   "engines": {

testem.js

@@ -14,9 +14,9 @@ module.exports = {
       args: [
         '--disable-gpu',
         '--headless',
-        '--remote-debugging-port=9222',
+        '--remote-debugging-port=0',
         '--window-size=1440,900'
       ]
-    },
+    }
   }
 };

tests/dummy/config/environment.js

@@ -11,6 +11,10 @@ module.exports = function(environment) {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
         // e.g. 'with-controller': true
+      },
+      EXTEND_PROTOTYPES: {
+        // Prevent Ember Data from overriding Date.parse.
+        Date: false
       }
     },
 
@@ -44,7 +48,7 @@ module.exports = function(environment) {
   }
 
   if (environment === 'production') {
-
+    // here you can enable a production-specific feature
   }
 
   return ENV;

tests/dummy/config/targets.js

@@ -1,5 +1,4 @@
 /* eslint-env node */
-
 module.exports = {
   browsers: [
     'ie 9',

tests/test-helper.js

@@ -1,8 +1,7 @@
-import resolver from './helpers/resolver';
-import {
-  setResolver
-} from 'ember-qunit';
-import { start } from 'ember-cli-qunit';
+import Application from '../app';
+import { setApplication } from '@ember/test-helpers';
+import { start } from 'ember-qunit';
+
+setApplication(Application.create({ autoboot: false }));
 
-setResolver(resolver);
 start();