upgrade to 2.18 (#1509)

config/environment.js

@@ -1,4 +1,3 @@
-/* eslint-env node */
 'use strict';
 
 module.exports = function(/* environment, appConfig */) {

ember-cli-build.js

@@ -1,6 +1,5 @@
 'use strict';
 
-/* eslint-env node */
 /* eslint-disable no-var, object-shorthand */
 
 var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

package.json

@@ -18,7 +18,7 @@
     "lint": "eslint app addon blueprints config server test-support tests *.js",
     "now-build": "ember build --environment=production",
     "now-start": "NODE_ENV=production PORT=8000 node fastboot-server.js",
-    "start": "ember server",
+    "start": "ember serve",
     "test": "ember test",
     "test:all": "ember try:each",
     "test:fastboot": "ember fastboot:test",
@@ -49,7 +49,7 @@
     "cors": "^2.8.4",
     "ember-ajax": "^3.0.0",
     "ember-bootstrap": "^1.0.0-beta.2",
-    "ember-cli": "2.17.2",
+    "ember-cli": "~2.18.0",
     "ember-cli-blueprint-test-helpers": "^0.18.0",
     "ember-cli-chai": "^0.4.2",
     "ember-cli-content-security-policy": "~1.0.0",
@@ -61,10 +61,10 @@
     "ember-cli-inject-live-reload": "^1.6.1",
     "ember-cli-mocha": "^0.14.4",
     "ember-cli-pretender": "^1.0.1",
-    "ember-cli-shims": "^1.1.0",
+    "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-uglify": "^2.0.0",
-    "ember-data": "^2.14.4",
+    "ember-data": "^2.18.0",
     "ember-debug-handlers-polyfill": "^1.1.0",
     "ember-disable-prototype-extensions": "^1.1.2",
     "ember-export-application-global": "^2.0.0",

testem.js

@@ -1,4 +1,3 @@
-/* eslint-env node */
 module.exports = {
   framework: 'mocha',
   test_page: 'tests/index.html?hidepassed',
@@ -15,7 +14,7 @@ module.exports = {
       args: [
         '--disable-gpu',
         '--headless',
-        '--remote-debugging-port=9222',
+        '--remote-debugging-port=0',
         '--window-size=1440,900'
       ]
     },

tests/dummy/config/environment.js

@@ -1,4 +1,3 @@
-/* eslint-env node */
 'use strict';
 
 module.exports = function(environment) {
@@ -68,6 +67,7 @@ module.exports = function(environment) {
     ENV.APP.LOG_VIEW_LOOKUPS = false;
 
     ENV.APP.rootElement = '#ember-testing';
+    ENV.APP.autoboot = false;
   }
 
   if (environment === 'production') {

tests/dummy/config/targets.js

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

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(() => {