Merge pull request #6567 from kevinansfield/ember-upgrades

Ember 2.4.0 upgrades

core/client/bower.json

@@ -4,7 +4,7 @@
     "blueimp-md5": "1.1.0",
     "codemirror": "5.2.0",
     "devicejs": "0.2.7",
-    "ember": "2.3.1",
+    "ember": "2.4.1",
     "ember-cli-shims": "0.1.0",
     "ember-cli-test-loader": "0.2.2",
     "ember-mocha": "0.8.11",

core/client/package.json

@@ -21,11 +21,11 @@
   "devDependencies": {
     "broccoli-asset-rev": "2.2.0",
     "ember-ajax": "0.7.1",
-    "ember-cli": "2.3.0",
+    "ember-cli": "2.4.0",
     "ember-cli-app-version": "1.0.0",
     "ember-cli-babel": "5.1.5",
     "ember-cli-content-security-policy": "0.4.0",
-    "ember-cli-dependency-checker": "1.1.0",
+    "ember-cli-dependency-checker": "1.2.0",
     "ember-cli-deprecation-workflow": "0.1.6",
     "ember-cli-fastclick": "1.0.3",
     "ember-cli-htmlbars": "1.0.1",
@@ -37,7 +37,7 @@
     "ember-cli-selectize": "0.4.3",
     "ember-cli-sri": "2.0.0",
     "ember-cli-uglify": "1.2.0",
-    "ember-data": "2.3.3",
+    "ember-data": "2.4.0",
     "ember-data-filter": "1.13.0",
     "ember-disable-proxy-controllers": "1.0.1",
     "ember-export-application-global": "1.0.5",

core/client/testem.js

@@ -0,0 +1,14 @@
+/*jshint node:true*/
+module.exports = {
+    'framework': 'mocha',
+    'test_page': 'tests/index.html?hidepassed',
+    'disable_watching': true,
+    'launch_in_ci': [
+        'Chrome',
+        'Firefox'
+    ],
+    'launch_in_dev': [
+        'Chrome',
+        'Firefox'
+    ]
+};

core/client/testem.json

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

core/client/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);
         }
     });
 }