remove createWithContainer helper

mainmatter · Nov 12, 2019 · fbb75bc · fbb75bc
1 parent 17fff5e
commit fbb75bc
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 24 deletions.
diff --git a/tests/helpers/create-with-container.js b/tests/helpers/create-with-container.js
diff --git a/tests/unit/internal-session-test.js b/tests/unit/internal-session-test.js
@@ -1,5 +1,6 @@
 import RSVP from 'rsvp';
 import { next } from '@ember/runloop';
+import { setOwner } from '@ember/application';
 import { describe, beforeEach, it } from 'mocha';
 import { setupTest } from 'ember-mocha';
 import { expect } from 'chai';
@@ -8,8 +9,6 @@ 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';
 
-import createWithContainer from '../helpers/create-with-container';
-
 describe('InternalSession', () => {
   setupTest();
 
@@ -25,7 +24,8 @@ describe('InternalSession', () => {
     authenticator = Authenticator.create();
     this.owner.register('authenticator:test', authenticator, { instantiate: false });
 
-    session = createWithContainer(InternalSession, { store }, this.owner);
+    session = InternalSession.create({ store });
+    setOwner(session, this.owner);
   });
 
   afterEach(function() {
@@ -802,7 +802,8 @@ describe('InternalSession', () => {
   });
 
   it('does not share the content object between multiple instances', function() {
-    let session2 = createWithContainer(InternalSession, { store }, this.owner);
+    let session2 = InternalSession.create({ store });
+    setOwner(session2, this.owner);
 
     expect(session2.get('content')).to.not.equal(session.get('content'));
   });

diff --git a/tests/unit/mixins/authenticated-route-mixin-test.js b/tests/unit/mixins/authenticated-route-mixin-test.js
@@ -1,4 +1,5 @@
 import Mixin from '@ember/object/mixin';
+import { setOwner } from '@ember/application';
 import RSVP from 'rsvp';
 import Route from '@ember/routing/route';
 import Service from '@ember/service';
@@ -8,8 +9,6 @@ import { expect } from 'chai';
 import sinonjs from 'sinon';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-import createWithContainer from '../../helpers/create-with-container';
-
 describe('AuthenticatedRouteMixin', () => {
   setupTest();
 
@@ -44,9 +43,10 @@ describe('AuthenticatedRouteMixin', () => {
 
       this.owner.register('service:session', Service.extend());
 
-      route = createWithContainer(Route.extend(MixinImplementingBeforeModel, AuthenticatedRouteMixin, {}), {
+      route = Route.extend(MixinImplementingBeforeModel, AuthenticatedRouteMixin).create({
         _authRouter: router
-      }, this.owner);
+      });
+      setOwner(route, this.owner);
 
       sinon.spy(transition, 'send');
       sinon.spy(router, 'transitionTo');

diff --git a/tests/unit/mixins/unauthenticated-route-mixin-test.js b/tests/unit/mixins/unauthenticated-route-mixin-test.js
@@ -1,4 +1,5 @@
 import Mixin from '@ember/object/mixin';
+import { setOwner } from '@ember/application';
 import RSVP from 'rsvp';
 import Route from '@ember/routing/route';
 import Service from '@ember/service';
@@ -7,7 +8,6 @@ import { setupTest } from 'ember-mocha';
 import { expect } from 'chai';
 import sinonjs from 'sinon';
 import UnauthenticatedRouteMixin from 'ember-simple-auth/mixins/unauthenticated-route-mixin';
-import createWithContainer from '../../helpers/create-with-container';
 
 describe('UnauthenticatedRouteMixin', () => {
   setupTest();
@@ -33,11 +33,12 @@ describe('UnauthenticatedRouteMixin', () => {
 
       this.owner.register('service:session', Service.extend());
 
-      route = createWithContainer(Route.extend(MixinImplementingBeforeModel, UnauthenticatedRouteMixin, {
+      route = Route.extend(MixinImplementingBeforeModel, UnauthenticatedRouteMixin, {
         // pretend this is never FastBoot
         // replace actual transitionTo as the router isn't set up etc.
         transitionTo() {}
-      }), {}, this.owner);
+      }).create();
+      setOwner(route, this.owner);
 
       sinon.spy(route, 'transitionTo');
     });

diff --git a/tests/unit/services/session-test.js b/tests/unit/services/session-test.js
@@ -1,4 +1,5 @@
 import ObjectProxy from '@ember/object/proxy';
+import { setOwner } from '@ember/application';
 import Evented from '@ember/object/evented';
 import { next } from '@ember/runloop';
 import EmberObject, { set } from '@ember/object';
@@ -24,7 +25,8 @@ describe('SessionService', () => {
     this.owner.register('authorizer:custom', EmberObject.extend({
       authorize() {}
     }));
-    sessionService = createWithContainer(Session, { session }, this.owner);
+    sessionService = Session.create({ session });
+    setOwner(sessionService, this.owner);
   });
 
   afterEach(function() {