From 8c4b7633781d21596cb870d04688d1e97cac4a49 Mon Sep 17 00:00:00 2001 From: sly7-7 Date: Fri, 9 Dec 2016 12:26:52 +0100 Subject: [PATCH] fix deprecated import of getOwner --- addon/internal-session.js | 4 ++-- addon/mixins/application-route-mixin.js | 3 +-- addon/mixins/authenticated-route-mixin.js | 3 +-- addon/mixins/unauthenticated-route-mixin.js | 3 +-- addon/services/session.js | 3 +-- addon/session-stores/adaptive.js | 3 +-- addon/session-stores/cookie.js | 3 +-- addon/session-stores/local-storage.js | 3 +-- package.json | 2 +- tests/unit/internal-session-test.js | 5 +++-- tests/unit/services/session-test.js | 5 +++-- 11 files changed, 16 insertions(+), 21 deletions(-) diff --git a/addon/internal-session.js b/addon/internal-session.js index 648a96ee3..58bb3353e 100644 --- a/addon/internal-session.js +++ b/addon/internal-session.js @@ -1,5 +1,4 @@ import Ember from 'ember'; -import getOwner from 'ember-getowner-polyfill'; const { RSVP, @@ -12,7 +11,8 @@ const { assert, deprecate, set, - debug + debug, + getOwner } = Ember; const assign = emberAssign || merge; diff --git a/addon/mixins/application-route-mixin.js b/addon/mixins/application-route-mixin.js index 6ad29edf7..16f256f1c 100644 --- a/addon/mixins/application-route-mixin.js +++ b/addon/mixins/application-route-mixin.js @@ -1,8 +1,7 @@ import Ember from 'ember'; -import getOwner from 'ember-getowner-polyfill'; import Configuration from './../configuration'; -const { inject, Mixin, A, run: { bind }, testing, computed } = Ember; +const { inject, Mixin, A, run: { bind }, testing, computed, getOwner } = Ember; /** The mixin for the application route; __defines methods that are called when diff --git a/addon/mixins/authenticated-route-mixin.js b/addon/mixins/authenticated-route-mixin.js index 71efe25eb..ff08d77ec 100644 --- a/addon/mixins/authenticated-route-mixin.js +++ b/addon/mixins/authenticated-route-mixin.js @@ -1,8 +1,7 @@ import Ember from 'ember'; -import getOwner from 'ember-getowner-polyfill'; import Configuration from './../configuration'; -const { inject: { service }, Mixin, assert, computed } = Ember; +const { inject: { service }, Mixin, assert, computed, getOwner } = Ember; /** __This mixin is used to make routes accessible only if the session is diff --git a/addon/mixins/unauthenticated-route-mixin.js b/addon/mixins/unauthenticated-route-mixin.js index 195cb4755..a91bbcf93 100644 --- a/addon/mixins/unauthenticated-route-mixin.js +++ b/addon/mixins/unauthenticated-route-mixin.js @@ -1,8 +1,7 @@ import Ember from 'ember'; -import getOwner from 'ember-getowner-polyfill'; import Configuration from './../configuration'; -const { inject: { service }, Mixin, assert, computed } = Ember; +const { inject: { service }, Mixin, assert, computed, getOwner } = Ember; /** __This mixin is used to make routes accessible only if the session is diff --git a/addon/services/session.js b/addon/services/session.js index 18451663c..ab8794364 100644 --- a/addon/services/session.js +++ b/addon/services/session.js @@ -1,9 +1,8 @@ import Ember from 'ember'; -import getOwner from 'ember-getowner-polyfill'; const SESSION_DATA_KEY_PREFIX = /^data\./; -const { computed, A, Service, Evented } = Ember; +const { computed, A, Service, Evented, getOwner } = Ember; /** __The session service provides access to the current session as well as diff --git a/addon/session-stores/adaptive.js b/addon/session-stores/adaptive.js index 9bb78c0d7..fcef0c785 100644 --- a/addon/session-stores/adaptive.js +++ b/addon/session-stores/adaptive.js @@ -1,11 +1,10 @@ /* global localStorage */ import Ember from 'ember'; -import getOwner from 'ember-getowner-polyfill'; import Base from 'ember-simple-auth/session-stores/base'; import LocalStorage from 'ember-simple-auth/session-stores/local-storage'; import Cookie from 'ember-simple-auth/session-stores/cookie'; -const { computed, inject: { service } } = Ember; +const { computed, inject: { service }, getOwner } = Ember; const LOCAL_STORAGE_TEST_KEY = '_ember_simple_auth_test_key'; diff --git a/addon/session-stores/cookie.js b/addon/session-stores/cookie.js index 23d87aa81..0cab9236a 100644 --- a/addon/session-stores/cookie.js +++ b/addon/session-stores/cookie.js @@ -1,9 +1,8 @@ import Ember from 'ember'; import BaseStore from './base'; import objectsAreEqual from '../utils/objects-are-equal'; -import getOwner from 'ember-getowner-polyfill'; -const { RSVP, computed, inject: { service }, run: { next, cancel, later, scheduleOnce }, isEmpty, typeOf, testing, isPresent, K, A } = Ember; +const { RSVP, computed, inject: { service }, run: { next, cancel, later, scheduleOnce }, isEmpty, typeOf, testing, isPresent, K, A, getOwner } = Ember; const persistingProperty = function(beforeSet = K) { return computed({ diff --git a/addon/session-stores/local-storage.js b/addon/session-stores/local-storage.js index 4d95361df..782557237 100644 --- a/addon/session-stores/local-storage.js +++ b/addon/session-stores/local-storage.js @@ -1,10 +1,9 @@ /* global localStorage */ import Ember from 'ember'; -import getOwner from 'ember-getowner-polyfill'; import BaseStore from './base'; import objectsAreEqual from '../utils/objects-are-equal'; -const { RSVP, $: jQuery, computed } = Ember; +const { RSVP, $: jQuery, computed, getOwner } = Ember; /** Session store that persists data in the browser's `localStorage`. diff --git a/package.json b/package.json index 1b0a19587..5cf570c17 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "ember-cli-import-polyfill": "^0.2.0", "ember-cli-is-package-missing": "^1.0.0", "ember-cookies": "^0.0.10", - "ember-getowner-polyfill": "^1.0.1", + "ember-getowner-polyfill": "^1.1.0", "ember-network": "^0.3.0", "silent-error": "^1.0.0" }, diff --git a/tests/unit/internal-session-test.js b/tests/unit/internal-session-test.js index 5a790641d..02e3d85da 100644 --- a/tests/unit/internal-session-test.js +++ b/tests/unit/internal-session-test.js @@ -7,7 +7,7 @@ import InternalSession from 'ember-simple-auth/internal-session'; import EphemeralStore from 'ember-simple-auth/session-stores/ephemeral'; import Authenticator from 'ember-simple-auth/authenticators/base'; -const { RSVP, K, run: { next } } = Ember; +const { RSVP, K, run: { next }, setOwner } = Ember; describe('InternalSession', () => { let session; @@ -19,7 +19,8 @@ describe('InternalSession', () => { container = { lookup() {} }; store = EphemeralStore.create(); authenticator = Authenticator.create(); - session = InternalSession.create({ store, container }); + session = InternalSession.create({ store }); + setOwner(session, container); sinon.stub(container, 'lookup').withArgs('authenticator').returns(authenticator); }); diff --git a/tests/unit/services/session-test.js b/tests/unit/services/session-test.js index 2d653a1a7..5fa221129 100644 --- a/tests/unit/services/session-test.js +++ b/tests/unit/services/session-test.js @@ -5,7 +5,7 @@ import { expect } from 'chai'; import sinon from 'sinon'; import Session from 'ember-simple-auth/services/session'; -const { ObjectProxy, Evented, run: { next }, set } = Ember; +const { ObjectProxy, Evented, run: { next }, set, setOwner } = Ember; describe('SessionService', () => { let sessionService; @@ -21,7 +21,8 @@ describe('SessionService', () => { }; let container = { lookup() {} }; sinon.stub(container, 'lookup').withArgs('authorizer').returns(authorizer); - sessionService = Session.create({ container, session }); + sessionService = Session.create({ session }); + setOwner(sessionService, container); }); it('forwards the "authenticationSucceeded" event from the session', (done) => {