tests: Remove setOwner() calls

setOwner() is not polyfilled by ember-getowner-polyfill and fails on older Ember versions
mainmatter · Jan 4, 2017 · 40236b8 · 40236b8
1 parent 27df653
commit 40236b8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git 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 }, setOwner } = Ember;
+const { RSVP, K, run: { next } } = Ember;
 
 describe('InternalSession', () => {
   let session;
@@ -19,8 +19,7 @@ describe('InternalSession', () => {
     container     = { lookup() {} };
     store         = EphemeralStore.create();
     authenticator = Authenticator.create();
-    session       = InternalSession.create({ store });
-    setOwner(session, container);
+    session       = InternalSession.create({ store, container });
     sinon.stub(container, 'lookup').withArgs('authenticator').returns(authenticator);
   });
 

diff --git a/tests/unit/mixins/application-route-mixin-test.js b/tests/unit/mixins/application-route-mixin-test.js
@@ -7,7 +7,7 @@ import ApplicationRouteMixin from 'ember-simple-auth/mixins/application-route-mi
 import InternalSession from 'ember-simple-auth/internal-session';
 import EphemeralStore from 'ember-simple-auth/session-stores/ephemeral';
 
-const { Route, run: { next }, setOwner } = Ember;
+const { Route, run: { next } } = Ember;
 
 describe('ApplicationRouteMixin', () => {
   let session;
@@ -30,10 +30,9 @@ describe('ApplicationRouteMixin', () => {
     route = Route.extend(ApplicationRouteMixin, {
       transitionTo() {}
     }).create({
-      session
+      session,
+      container: containerMock
     });
-
-    setOwner(route, containerMock);
   });
 
   describe('mapping of service events to route methods', () => {

diff --git a/tests/unit/mixins/authenticated-route-mixin-test.js b/tests/unit/mixins/authenticated-route-mixin-test.js
@@ -8,7 +8,7 @@ import InternalSession from 'ember-simple-auth/internal-session';
 import Configuration from 'ember-simple-auth/configuration';
 import EphemeralStore from 'ember-simple-auth/session-stores/ephemeral';
 
-const { Mixin, RSVP, Route, setOwner } = Ember;
+const { Mixin, RSVP, Route } = Ember;
 
 describe('AuthenticatedRouteMixin', () => {
   let route;
@@ -51,9 +51,7 @@ describe('AuthenticatedRouteMixin', () => {
         _isFastBoot: false,
         // replace actual transitionTo as the router isn't set up etc.
         transitionTo() {}
-      }).create({ session });
-
-      setOwner(route, containerMock);
+      }).create({ session, container: containerMock });
 
       sinon.spy(transition, 'send');
       sinon.spy(route, 'transitionTo');

diff --git 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, setOwner } = Ember;
+const { ObjectProxy, Evented, run: { next }, set } = Ember;
 
 describe('SessionService', () => {
   let sessionService;
@@ -23,8 +23,7 @@ describe('SessionService', () => {
     let stub = sinon.stub(container, 'lookup');
     stub.withArgs('authorizer').returns(authorizer);
     stub.withArgs('bad-authorizer').returns(undefined);
-    sessionService = Session.create({ session });
-    setOwner(sessionService, container);
+    sessionService = Session.create({ session, container });
   });
 
   it('forwards the "authenticationSucceeded" event from the session', (done) => {