Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-24 23:48:13 -05:00
Code Issues Activity

chore(package): update ember-cli to version 2.6.0

Browse source 
https://greenkeeper.io/
This commit is contained in:
greenkeeperio-bot 2016-06-10 08:54:54 +01:00 • committed by Kevin Ansfield
parent 089226330b
commit b2b5301b96
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ghost/admin/package.json
View file

@ -27,7 +27,7 @@
"broccoli-asset-rev": "2.4.2", "broccoli-asset-rev": "2.4.2",
"csscomb": "3.1.8", "csscomb": "3.1.8",
"ember-ajax": "2.4.1", "ember-ajax": "2.4.1",
"ember-cli": "2.5.1", "ember-cli": "2.6.0",
"ember-cli-app-version": "1.0.0", "ember-cli-app-version": "1.0.0",
"ember-cli-babel": "5.1.6", "ember-cli-babel": "5.1.6",
"ember-cli-content-security-policy": "0.5.0", "ember-cli-content-security-policy": "0.5.0",

13
ghost/admin/tests/helpers/module-for-acceptance.js
View file

@ -1,23 +1,24 @@
/* jscs:disable */
import { module } from 'qunit'; import { module } from 'qunit';
import Ember from 'ember';
import startApp from '../helpers/start-app'; import startApp from '../helpers/start-app';
import destroyApp from '../helpers/destroy-app'; import destroyApp from '../helpers/destroy-app';
const { RSVP: {Promise} } = Ember;
export default function (name, options = {}) { export default function (name, options = {}) {
module(name, { module(name, {
beforeEach() { beforeEach() {
this.application = startApp(); this.application = startApp();
if (options.beforeEach) { if (options.beforeEach) {
options.beforeEach(...arguments); return options.beforeEach(...arguments);
} }
}, },
afterEach() { afterEach() {
if (options.afterEach) { let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
options.afterEach(...arguments); return Promise.resolve(afterEach).then(() => destroyApp(this.application));
}
destroyApp(this.application);
} }
}); });
} }