Merge pull request #304 from cibernox/update-to-2.18

Update to 2.18
emberjs · Jan 21, 2018 · 70ef42c · 70ef42c
2 parents c26446d + 5ec8867
commit 70ef42c
Show file tree

Hide file tree

Showing 5 changed files with 393 additions and 240 deletions.
diff --git a/.npmignore b/.npmignore
@@ -20,8 +20,8 @@ testem.log
 .bowerrc
 .editorconfig
 .ember-cli
-.gitignore
 .eslintrc.js
+.gitignore
 .watchmanconfig
 .travis.yml
 bower.json

diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
   },
   "devDependencies": {
     "documentation": "^5.3.5",
-    "ember-cli": "^2.17.1",
+    "ember-cli": "~2.18.0",
     "ember-cli-dependency-checker": "^2.0.0",
     "ember-cli-eslint": "^4.2.1",
     "ember-cli-htmlbars": "^2.0.1",
@@ -54,7 +54,7 @@
     "ember-maybe-import-regenerator-for-testing": "^1.0.0",
     "ember-native-dom-event-dispatcher": "^0.6.3",
     "ember-resolver": "^4.0.0",
-    "ember-source": "~2.17.0",
+    "ember-source": "~2.18.0",
     "ember-source-channel-url": "^1.0.1",
     "ember-try": "^0.2.23",
     "eslint-config-prettier": "^2.6.0",

diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
@@ -41,6 +41,7 @@ module.exports = function(environment) {
     ENV.APP.LOG_VIEW_LOOKUPS = false;
 
     ENV.APP.rootElement = '#ember-testing';
+    ENV.APP.autoboot = false;
   }
 
   return ENV;

diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
@@ -5,6 +5,7 @@ import { run } from '@ember/runloop';
 
 export default function startApp(attrs) {
   let attributes = merge({}, config.APP);
+  attributes.autoboot = true;
   attributes = merge(attributes, attrs); // use defaults, but you can override;
 
   return run(() => {