fix(deps): upgrade to ember 2.4.1 (#53)

app/app.js

@@ -3,8 +3,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import Ember from 'ember';
-import Resolver from 'ember/resolver';
-import loadInitializers from 'ember/load-initializers';
+import Resolver from 'ember-resolver';
+import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
 let App;

app/router.js

@@ -15,7 +15,7 @@ Router.map(function () {
   this.route('clients', {path: '/clients'});
   this.route('clients.token', {path: '/clients/token'});
   this.route('client.register',  {path:'/client/register'});
-  this.resource('client', {path: '/client/:client_id'}, function () {
+  this.route('client', {path: '/client/:client_id', resetNamespace: true}, function () {
     this.route('delete');
     this.route('update');
   });

app/routes/client/register.js

@@ -12,7 +12,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
       return model.save().then(
         () =>
           this.controllerFor('client.register').set('registrationSuccess', true)
-        );
+      );
     },
     cancel: function() {
       this.transitionTo('clients');

bower.json

@@ -4,17 +4,11 @@
     "handlebars": "1.3.0",
     "foundation": "zurb/bower-foundation#5.4.5",
     "blanket": "1.1.5",
-    "ember": "1.13.12",
-    "ember-cli-shims": "0.0.6",
-    "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
-    "ember-data": "1.13.15",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
+    "ember": "2.4.1",
+    "ember-cli-shims": "0.1.0",
+    "ember-cli-test-loader": "0.2.2",
     "ember-qunit": "0.4.16",
-    "ember-qunit-notifications": "0.1.0",
-    "ember-resolver": "0.1.20",
-    "jquery": "1.11.3",
-    "loader.js": "ember-cli/loader.js#3.4.0",
-    "qunit": "1.20.0"
+    "ember-qunit-notifications": "0.1.0"
   },
   "devDependencies": {
     "fxa-js-client": "0.1.30"

package.json

@@ -29,27 +29,31 @@
     "client-sessions": "0.7.0",
     "convict": "1.5.0",
     "cookie-parser": "1.4.3",
-    "ember-cli": "1.13.15",
+    "ember-cli": "2.4.0",
+    "ember-cli-sri": "~2.0.0",
     "ember-cli-app-version": "1.0.0",
+    "ember-load-initializers": "~0.5.0",
     "ember-cli-babel": "5.1.10",
+    "ember-resolver": "~2.0.3",
+    "ember-cli-dependency-checker": "~1.2.0",
     "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-htmlbars": "1.0.1",
     "ember-cli-htmlbars-inline-precompile": "0.3.1",
-    "ember-cli-ic-ajax": "0.2.4",
     "ember-cli-inject-live-reload": "1.3.1",
-    "ember-data": "1.13.8",
+    "ember-data": "2.4.0",
+    "ember-ajax": "0.7.1",
     "ember-disable-proxy-controllers": "1.0.1",
     "ember-export-application-global": "1.0.4",
-    "ember-simple-auth": "1.0.1",
+    "ember-simple-auth": "1.2.0",
     "express": "4.15.5",
     "glob": "7.1.1",
     "mozlog": "2.0.6",
+    "loader.js": "~4.0.0",
     "request": "2.79.0"
   },
   "devDependencies": {
-    "ember-cli-qunit": "1.0.4",
+    "ember-cli-qunit": "1.2.1",
     "ember-cli-release": "0.2.8",
-    "ember-cli-sri": "1.2.0",
     "ember-cli-uglify": "1.2.0",
     "eslint-config-fxa": "3.0.0",
     "grunt": "^1.0.1",

testem.js

@@ -0,0 +1,15 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*jshint node:true*/
+module.exports = {
+  'framework': 'qunit',
+  'test_page': 'tests/index.html?hidepassed',
+  'disable_watching': true,
+  'launch_in_ci': [
+    'Firefox'
+  ],
+  'launch_in_dev': [
+    'Firefox'
+  ]
+};

testem.json

@@ -1,11 +0,0 @@
-{
-  "framework": "qunit",
-  "test_page": "tests/index.html?hidepassed",
-  "disable_watching": true,
-  "launch_in_ci": [
-    "Firefox"
-  ],
-  "launch_in_dev": [
-    "Firefox"
-  ]
-}

tests/helpers/module-for-acceptance.js

@@ -13,11 +13,11 @@ export default function(name, options = {}) {
     },
 
     afterEach() {
-      destroyApp(this.application);
-
       if (options.afterEach) {
         options.afterEach.apply(this, arguments);
       }
+
+      destroyApp(this.application);
     }
   });
 }