Closes #156

softlayer · Mar 4, 2016 · 8a55edf · 8a55edf
1 parent 1a727cc
commit 8a55edf
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 22 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "sl-ember-behavior",
   "dependencies": {
-    "ember": "~2.3.1",
+    "ember": "~2.4.1",
     "ember-cli-shims": "0.1.0",
     "ember-cli-test-loader": "0.2.2",
     "ember-qunit-notifications": "0.1.0"

diff --git a/config/ember-try.js b/config/ember-try.js
@@ -1,4 +1,4 @@
-/*jshint node:true*/
+/* jshint node:true*/
 module.exports = {
   scenarios: [
     {
@@ -7,6 +7,17 @@ module.exports = {
         dependencies: { }
       }
     },
+    {
+      name: 'ember-1-13',
+      bower: {
+        dependencies: {
+          'ember': '~1.13.0'
+        },
+        resolutions: {
+          'ember': '~1.13.0'
+        }
+      }
+    },
     {
       name: 'ember-release',
       bower: {

diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
     "broccoli-asset-rev": "^2.4.2",
     "broccoli-string-replace": "0.1.1",
     "ember-ajax": "0.7.1",
-    "ember-cli": "2.3.0",
+    "ember-cli": "2.4.1",
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-blanket": "0.8.0",
     "ember-cli-dependency-checker": "^1.2.0",

diff --git a/testem.js b/testem.js
@@ -0,0 +1,18 @@
+/* jshint node:true*/
+module.exports = {
+    'framework': 'qunit',
+    'test_page': 'tests/index.html?hidepassed&nojshint',
+    'disable_watching': true,
+    'launch_in_ci': [
+        'PhantomJS'
+    ],
+    'launch_in_dev': [
+        'PhantomJS',
+        'Chrome',
+        'IE10',
+        'IE11',
+        'Firefox',
+        'Safari',
+        'Opera'
+    ]
+};
diff --git a/testem.json b/testem.json
diff --git a/tests/helpers/module-for-acceptance.js b/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 );
         }
     });
 }