From 8a55edfd19ed2a1dbc1c5d5ca334eaf613de3db7 Mon Sep 17 00:00:00 2001
From: Jeremy Brown <jeremy@notmessenger.com>
Date: Thu, 3 Mar 2016 20:32:01 -0600
Subject: [PATCH] Closes softlayer/sl-ember-behavior#156

---
 bower.json                             |  2 +-
 config/ember-try.js                    | 13 ++++++++++++-
 package.json                           |  2 +-
 testem.js                              | 18 ++++++++++++++++++
 testem.json                            | 17 -----------------
 tests/helpers/module-for-acceptance.js |  4 ++--
 6 files changed, 34 insertions(+), 22 deletions(-)
 create mode 100755 testem.js
 delete mode 100755 testem.json

diff --git a/bower.json b/bower.json
index 316244e..c6882d8 100755
--- 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
index be846e1..8c87cc4 100644
--- 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
index 008c3a2..6cfccd7 100644
--- 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
new file mode 100755
index 0000000..c8cbe3d
--- /dev/null
+++ 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
deleted file mode 100755
index 3e447b1..0000000
--- a/testem.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "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/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js
index 48927ae..8874429 100644
--- 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 );
         }
     });
 }