From f451ff5aefe088e82284c064b99466cb939f257f Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Tue, 1 Mar 2016 07:38:03 +0000 Subject: [PATCH 1/3] deps: ember-cli@2.4.0 --- core/client/package.json | 4 ++-- core/client/testem.js | 14 ++++++++++++++ core/client/testem.json | 13 ------------- core/client/tests/helpers/module-for-acceptance.js | 4 ++-- 4 files changed, 18 insertions(+), 17 deletions(-) create mode 100644 core/client/testem.js delete mode 100644 core/client/testem.json diff --git a/core/client/package.json b/core/client/package.json index b8c56bbcb1..5dae11cc27 100644 --- a/core/client/package.json +++ b/core/client/package.json @@ -21,11 +21,11 @@ "devDependencies": { "broccoli-asset-rev": "2.2.0", "ember-ajax": "0.7.1", - "ember-cli": "2.3.0", + "ember-cli": "2.4.0", "ember-cli-app-version": "1.0.0", "ember-cli-babel": "5.1.5", "ember-cli-content-security-policy": "0.4.0", - "ember-cli-dependency-checker": "1.1.0", + "ember-cli-dependency-checker": "1.2.0", "ember-cli-deprecation-workflow": "0.1.6", "ember-cli-fastclick": "1.0.3", "ember-cli-htmlbars": "1.0.1", diff --git a/core/client/testem.js b/core/client/testem.js new file mode 100644 index 0000000000..bea2f315f6 --- /dev/null +++ b/core/client/testem.js @@ -0,0 +1,14 @@ +/*jshint node:true*/ +module.exports = { + 'framework': 'mocha', + 'test_page': 'tests/index.html?hidepassed', + 'disable_watching': true, + 'launch_in_ci': [ + 'Chrome', + 'Firefox' + ], + 'launch_in_dev': [ + 'Chrome', + 'Firefox' + ] +}; diff --git a/core/client/testem.json b/core/client/testem.json deleted file mode 100644 index 79d466a5cd..0000000000 --- a/core/client/testem.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "framework": "mocha", - "test_page": "tests/index.html?hidepassed", - "disable_watching": true, - "launch_in_ci": [ - "Chrome", - "Firefox" - ], - "launch_in_dev": [ - "Chrome", - "Firefox" - ] -} diff --git a/core/client/tests/helpers/module-for-acceptance.js b/core/client/tests/helpers/module-for-acceptance.js index f2377a974d..67abb91135 100644 --- a/core/client/tests/helpers/module-for-acceptance.js +++ b/core/client/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); } }); } From 73f2a61feb67aecc51c7ab756994cd245fd9e6fc Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Tue, 1 Mar 2016 07:38:51 +0000 Subject: [PATCH 2/3] deps: ember@2.4.1 --- core/client/bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/client/bower.json b/core/client/bower.json index 665cc2dd09..05b9790515 100644 --- a/core/client/bower.json +++ b/core/client/bower.json @@ -4,7 +4,7 @@ "blueimp-md5": "1.1.0", "codemirror": "5.2.0", "devicejs": "0.2.7", - "ember": "2.3.1", + "ember": "2.4.1", "ember-cli-shims": "0.1.0", "ember-cli-test-loader": "0.2.2", "ember-mocha": "0.8.11", From 4d35f954b4c21f2d551f0292395af9ee217652a4 Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Tue, 1 Mar 2016 07:39:41 +0000 Subject: [PATCH 3/3] deps: ember-data@2.4.0 --- core/client/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/client/package.json b/core/client/package.json index 5dae11cc27..08262a6ecc 100644 --- a/core/client/package.json +++ b/core/client/package.json @@ -37,7 +37,7 @@ "ember-cli-selectize": "0.4.3", "ember-cli-sri": "2.0.0", "ember-cli-uglify": "1.2.0", - "ember-data": "2.3.3", + "ember-data": "2.4.0", "ember-data-filter": "1.13.0", "ember-disable-proxy-controllers": "1.0.1", "ember-export-application-global": "1.0.5",