From ce47cdd1adf8bacdb386288b17481ddb000e9c5b Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Fri, 28 Jul 2017 10:24:02 -0400 Subject: [PATCH 1/4] Fix tests to work on Ember 2.15+. --- tests/unit/getowner-test.js | 55 +++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/tests/unit/getowner-test.js b/tests/unit/getowner-test.js index a9e2559..c4e9f42 100644 --- a/tests/unit/getowner-test.js +++ b/tests/unit/getowner-test.js @@ -42,32 +42,35 @@ test('it can use getOwner to register things', function(assert) { assert.ok(result.isBaz, 'was able to register and lookup'); }); -test('it can use getOwner for the private _lookupFactory', function(assert) { - let testFn = () => { - let subject = this.subject(); - let owner = getOwner(subject); - - let Baz = Ember.Object.extend(); - Baz.reopenClass({ isBazFactory: true }); - - owner.register('foo:baz', Baz); - - let result = owner._lookupFactory('foo:baz'); - - assert.ok(result.isBazFactory, 'was able to register and _lookupFactory'); - }; - - // we only can assert that a deprecation occurs when we are using - // our custom `getOwner` polyfill. For Ember 2.3 - 2.11 we simply confirm - // the functionality (not the deprecation). - if (!hasEmberVersion(2,3) || hasEmberVersion(2,12)) { - assert.deprecations(testFn, [ - 'Using "_lookupFactory" is deprecated. Please use container.factoryFor instead.' - ]); - } else { - testFn(); - } -}); +// In Ember 2.15 `_lookupFactory` was removed (in favor of `factoryFor` +if (!hasEmberVersion(2,15)) { + test('it can use getOwner for the private _lookupFactory', function(assert) { + let testFn = () => { + let subject = this.subject(); + let owner = getOwner(subject); + + let Baz = Ember.Object.extend(); + Baz.reopenClass({ isBazFactory: true }); + + owner.register('foo:baz', Baz); + + let result = owner._lookupFactory('foo:baz'); + + assert.ok(result.isBazFactory, 'was able to register and _lookupFactory'); + }; + + // we only can assert that a deprecation occurs when we are using + // our custom `getOwner` polyfill. For Ember 2.3 - 2.11 we simply confirm + // the functionality (not the deprecation). + if (!hasEmberVersion(2,3) || hasEmberVersion(2,12)) { + assert.deprecations(testFn, [ + 'Using "_lookupFactory" is deprecated. Please use container.factoryFor instead.' + ]); + } else { + testFn(); + } + }); +} test('it can use getOwner for factoryFor', function(assert) { let subject = this.subject(); From dd44926ec91b6266a3a3518f917a567aa84de4cc Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Fri, 28 Jul 2017 10:34:47 -0400 Subject: [PATCH 2/4] Add back `ember-cli-babel` as a devDep. --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 22e4ff4..956cb12 100644 --- a/package.json +++ b/package.json @@ -33,10 +33,11 @@ "ember-ajax": "^2.0.1", "ember-cli": "^2.7.0", "ember-cli-app-version": "^1.0.0", + "ember-cli-babel": "^6.6.0", "ember-cli-content-security-policy": "0.5.0", "ember-cli-dependency-checker": "^1.2.0", "ember-cli-htmlbars": "^1.0.3", - "ember-cli-htmlbars-inline-precompile": "^0.3.1", + "ember-cli-htmlbars-inline-precompile": "^0.4.2", "ember-cli-inject-live-reload": "^1.4.0", "ember-cli-jshint": "^1.0.0", "ember-cli-qunit": "^3.1.0", From fa977390b8ec417dc2ee4727b67c78e3b0d5f4a7 Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Fri, 28 Jul 2017 10:40:16 -0400 Subject: [PATCH 3/4] Add Ember 2.12 to ember-try config. --- config/ember-try.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config/ember-try.js b/config/ember-try.js index e0041bc..2a870c9 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -82,6 +82,14 @@ module.exports = { } } }, + { + name: 'ember-2.12', + bower: { + dependencies: { + "ember": "~2.12.0" + } + } + }, { name: 'ember-release', bower: { From 67f5f27b2c02459933cd94ada0b93af0afd4d00b Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Fri, 28 Jul 2017 10:41:05 -0400 Subject: [PATCH 4/4] Update README adding 2.12 + 2.14 etc. [ci skip] --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6de564e..ecf9e97 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,10 @@ the list of supported Ember versions at the time of authoring was: * 2.3 * 2.4 * 2.8 -* 2.12 (canary at the time) +* 2.12 +* 2.14 +* 2.15 +* 2.16 (canary at the time) ## Addon Maintenance