From b2b5301b96e8debf4e5786c35c49580b93532e81 Mon Sep 17 00:00:00 2001
From: greenkeeperio-bot <support@greenkeeper.io>
Date: Fri, 10 Jun 2016 08:54:54 +0100
Subject: [PATCH] chore(package): update ember-cli to version 2.6.0

https://greenkeeper.io/
---
 ghost/admin/package.json                           |  2 +-
 ghost/admin/tests/helpers/module-for-acceptance.js | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ghost/admin/package.json b/ghost/admin/package.json
index 93ab02ade3..5c00128e28 100644
--- a/ghost/admin/package.json
+++ b/ghost/admin/package.json
@@ -27,7 +27,7 @@
     "broccoli-asset-rev": "2.4.2",
     "csscomb": "3.1.8",
     "ember-ajax": "2.4.1",
-    "ember-cli": "2.5.1",
+    "ember-cli": "2.6.0",
     "ember-cli-app-version": "1.0.0",
     "ember-cli-babel": "5.1.6",
     "ember-cli-content-security-policy": "0.5.0",
diff --git a/ghost/admin/tests/helpers/module-for-acceptance.js b/ghost/admin/tests/helpers/module-for-acceptance.js
index d9d22b6958..08a23e0e9b 100644
--- a/ghost/admin/tests/helpers/module-for-acceptance.js
+++ b/ghost/admin/tests/helpers/module-for-acceptance.js
@@ -1,23 +1,24 @@
+/* jscs:disable */
 import { module } from 'qunit';
+import Ember from 'ember';
 import startApp from '../helpers/start-app';
 import destroyApp from '../helpers/destroy-app';
 
+const { RSVP: {Promise} } = Ember;
+
 export default function (name, options = {}) {
     module(name, {
         beforeEach() {
             this.application = startApp();
 
             if (options.beforeEach) {
-                options.beforeEach(...arguments);
+                return options.beforeEach(...arguments);
             }
         },
 
         afterEach() {
-            if (options.afterEach) {
-                options.afterEach(...arguments);
-            }
-
-            destroyApp(this.application);
+            let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
+            return Promise.resolve(afterEach).then(() => destroyApp(this.application));
         }
     });
 }