Skip to content

Commit f451ff5

Browse files
committed
deps: ember-cli@2.4.0
1 parent bd3622b commit f451ff5

File tree

4 files changed

+18
-17
lines changed

4 files changed

+18
-17
lines changed

core/client/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
"devDependencies": {
2222
"broccoli-asset-rev": "2.2.0",
2323
"ember-ajax": "0.7.1",
24-
"ember-cli": "2.3.0",
24+
"ember-cli": "2.4.0",
2525
"ember-cli-app-version": "1.0.0",
2626
"ember-cli-babel": "5.1.5",
2727
"ember-cli-content-security-policy": "0.4.0",
28-
"ember-cli-dependency-checker": "1.1.0",
28+
"ember-cli-dependency-checker": "1.2.0",
2929
"ember-cli-deprecation-workflow": "0.1.6",
3030
"ember-cli-fastclick": "1.0.3",
3131
"ember-cli-htmlbars": "1.0.1",

core/client/testem.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/*jshint node:true*/
2+
module.exports = {
3+
'framework': 'mocha',
4+
'test_page': 'tests/index.html?hidepassed',
5+
'disable_watching': true,
6+
'launch_in_ci': [
7+
'Chrome',
8+
'Firefox'
9+
],
10+
'launch_in_dev': [
11+
'Chrome',
12+
'Firefox'
13+
]
14+
};

core/client/testem.json

Lines changed: 0 additions & 13 deletions
This file was deleted.

core/client/tests/helpers/module-for-acceptance.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ export default function (name, options = {}) {
1313
},
1414

1515
afterEach() {
16-
destroyApp(this.application);
17-
1816
if (options.afterEach) {
1917
options.afterEach.apply(this, arguments);
2018
}
19+
20+
destroyApp(this.application);
2121
}
2222
});
2323
}

0 commit comments

Comments
 (0)