Ember 2.12

.npmignore

@@ -10,7 +10,7 @@
 .editorconfig
 .ember-cli
 .gitignore
-.jshintrc
+.eslintrc.js
 .watchmanconfig
 .travis.yml
 bower.json

config/ember-try.js

@@ -1,4 +1,4 @@
-/*jshint node:true*/
+/* eslint-env node */
 module.exports = {
   scenarios: [
     {

config/environment.js

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

ember-cli-build.js

@@ -1,9 +1,8 @@
-/*jshint node:true*/
-/* global require, module */
-var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
+/* eslint-env node */
+const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {
-  var app = new EmberAddon(defaults, {
+  const app = new EmberAddon(defaults, {
     shepherd: {
       theme: 'arrows'
     }

index.js

@@ -1,4 +1,4 @@
-/* eslint-disable */
+/* eslint-env node */
 'use strict';
 
 module.exports = {

package.json

@@ -51,22 +51,19 @@
     "broccoli-asset-rev": "^2.4.5",
     "codeclimate-test-reporter": "0.4.1",
     "ember-assign-polyfill": "2.0.1",
-    "ember-cli": "2.11.0",
-    "ember-cli-app-version": "^2.0.0",
+    "ember-cli": "2.12.0",
     "ember-cli-code-coverage": "0.3.11",
     "ember-cli-dependency-checker": "^1.3.0",
-    "ember-cli-eslint": "3.0.2",
+    "ember-cli-eslint": "^3.0.0",
     "ember-cli-foundation-sass": "^2.0.0",
     "ember-cli-github-pages": "0.1.2",
     "ember-cli-htmlbars": "^1.1.1",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.3",
+    "ember-cli-htmlbars-inline-precompile": "^0.3.6",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-qunit": "^3.0.1",
-    "ember-cli-release": "^0.2.9",
+    "ember-cli-qunit": "^3.1.0",
     "ember-cli-sass": "^6.1.1",
     "ember-cli-shims": "^1.0.2",
     "ember-cli-sri": "^2.1.0",
-    "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-debonair": "0.3.0",
     "ember-disable-prototype-extensions": "^1.1.0",
@@ -75,16 +72,16 @@
     "ember-load-initializers": "^0.6.0",
     "ember-prism": "0.0.8",
     "ember-resolver": "^2.0.3",
-    "ember-source": "^2.11.0",
+    "ember-source": "~2.12.0",
     "ember-tether": "0.4.1",
     "eslint-plugin-ship-shape": "0.4.0",
-    "loader.js": "^4.0.10"
+    "loader.js": "^4.2.3"
   },
   "peerDependencies": {
     "ember-tether": "0.x"
   },
   "engines": {
-    "node": ">= 0.12.0"
+    "node": ">= 4"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config",

testem.js

@@ -1,6 +1,5 @@
-/* eslint-disable */
+/* eslint-env node */
 module.exports = {
-  "framework": "qunit",
   "test_page": "tests/index.html?hidepassed",
   "disable_watching": true,
   "launch_in_ci": [

tests/dummy/config/environment.js

@@ -1,4 +1,4 @@
-/* eslint-disable */
+/* eslint-env node */
 
 module.exports = function(environment) {
   var ENV = {

tests/helpers/start-app.js

@@ -1,19 +1,16 @@
 import Ember from 'ember';
 import Application from '../../app';
 import config from '../../config/environment';
-const { assign, run } = Ember;
+const { merge, run } = Ember;
 
 export default function startApp(attrs) {
-  let application;
+  let attributes = merge({}, config.APP);
+  attributes = merge(attributes, attrs); // use defaults, but you can override;
 
-  // use defaults, but you can override
-  const attributes = assign({}, config.APP, attrs);
-
-  run(() => {
-    application = Application.create(attributes);
+  return run(() => {
+    const application = Application.create(attributes);
     application.setupForTesting();
     application.injectTestHelpers();
+    return application;
   });
-
-  return application;
 }