Use Sinon sandbox

tests/unit/authenticators/torii-test.js

@@ -1,14 +1,16 @@
 import RSVP from 'rsvp';
 import { describe, beforeEach, it } from 'mocha';
 import { expect } from 'chai';
-import sinon from 'sinon';
+import sinonjs from 'sinon';
 import Torii from 'ember-simple-auth/authenticators/torii';
 
 describe('ToriiAuthenticator', () => {
+  let sinon;
   let authenticator;
   let torii;
 
   beforeEach(function() {
+    sinon = sinonjs.sandbox.create();
     torii = {
       fetch() {},
       open() {},
@@ -17,6 +19,10 @@ describe('ToriiAuthenticator', () => {
     authenticator = Torii.create({ torii });
   });
 
+  afterEach(function() {
+    sinon.restore();
+  });
+
   describe('#restore', function() {
     function itDoesNotRestore(data) {
       it('returns a rejecting promise', function() {

tests/unit/authorizers/devise-test.js

@@ -1,19 +1,25 @@
 import { describe, beforeEach, it } from 'mocha';
 import { expect } from 'chai';
-import sinon from 'sinon';
+import sinonjs from 'sinon';
 import Devise from 'ember-simple-auth/authorizers/devise';
 import { registerDeprecationHandler } from '@ember/debug';
 
 describe('DeviseAuthorizer', () => {
+  let sinon;
   let authorizer;
   let block;
   let data;
 
   beforeEach(function() {
+    sinon = sinonjs.sandbox.create();
     authorizer = Devise.create();
     block = sinon.spy();
   });
 
+  afterEach(function() {
+    sinon.restore();
+  });
+
   it('shows deprecation warning from BaseAuthorizer', function() {
     let warnings;
     registerDeprecationHandler((message, options, next) => {

tests/unit/authorizers/oauth2-bearer-test.js

@@ -1,18 +1,24 @@
 import { describe, beforeEach, it } from 'mocha';
 import { expect } from 'chai';
-import sinon from 'sinon';
+import sinonjs from 'sinon';
 import OAuth2BearerAuthorizer from 'ember-simple-auth/authorizers/oauth2-bearer';
 import { registerDeprecationHandler } from '@ember/debug';
 
 describe('OAuth2BearerAuthorizer', () => {
+  let sinon;
   let authorizer;
   let data;
   let block;
 
   beforeEach(function() {
+    sinon = sinonjs.sandbox.create();
     block = sinon.spy();
   });
 
+  afterEach(function() {
+    sinon.restore();
+  });
+
   it('shows deprecation warning from BaseAuthorizer', function() {
     let warnings;
     registerDeprecationHandler((message, options, next) => {

tests/unit/initializers/setup-session-restoration-test.js

@@ -3,15 +3,17 @@ import { getOwner, setOwner } from '@ember/application';
 import RSVP from 'rsvp';
 import { describe, beforeEach, it } from 'mocha';
 import { expect } from 'chai';
-import sinon from 'sinon';
+import sinonjs from 'sinon';
 import setupSessionRestoration from 'ember-simple-auth/initializers/setup-session-restoration';
 
 describe('setupSessionRestoration', () => {
+  let sinon;
   let registry;
   let resolveStub;
   let ApplicationRoute;
 
   beforeEach(function() {
+    sinon = sinonjs.sandbox.create();
     registry = {
       resolve() {}
     };
@@ -21,6 +23,10 @@ describe('setupSessionRestoration', () => {
     resolveStub = sinon.stub(registry, 'resolve');
   });
 
+  afterEach(function() {
+    sinon.restore();
+  });
+
   it('adds a beforeModel method', function() {
     resolveStub.withArgs('route:application').returns(ApplicationRoute);
     setupSessionRestoration(registry);

tests/unit/initializers/setup-session-service-test.js

@@ -1,17 +1,23 @@
 import { describe, beforeEach, it } from 'mocha';
 import { expect } from 'chai';
-import sinon from 'sinon';
+import sinonjs from 'sinon';
 import setupSessionService from 'ember-simple-auth/initializers/setup-session-service';
 
 describe('setupSessionService', () => {
+  let sinon;
   let registry;
 
   beforeEach(function() {
+    sinon = sinonjs.sandbox.create();
     registry = {
       injection() {}
     };
   });
 
+  afterEach(function() {
+    sinon.restore();
+  });
+
   it('injects the session into the session service', function() {
     sinon.spy(registry, 'injection');
     setupSessionService(registry);

tests/unit/initializers/setup-session-test.js

@@ -6,22 +6,28 @@ import {
   it
 } from 'mocha';
 import { expect } from 'chai';
-import sinon from 'sinon';
+import sinonjs from 'sinon';
 import setupSession from 'ember-simple-auth/initializers/setup-session';
 import Ephemeral from 'ember-simple-auth/session-stores/ephemeral';
 import InternalSession from 'ember-simple-auth/internal-session';
 
 describe('setupSession', () => {
+  let sinon;
   let registry;
 
   beforeEach(function() {
+    sinon = sinonjs.sandbox.create();
     registry = {
       register() {},
       injection() {}
     };
     Ember.testing = true;
   });
 
+  afterEach(function() {
+    sinon.restore();
+  });
+
   it('registers the session', function() {
     sinon.spy(registry, 'register');
     setupSession(registry);

tests/unit/internal-session-test.js

@@ -2,27 +2,33 @@ import RSVP from 'rsvp';
 import { next } from '@ember/runloop';
 import { describe, beforeEach, it } from 'mocha';
 import { expect } from 'chai';
-import sinon from 'sinon';
+import sinonjs from 'sinon';
 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', () => {
+  let sinon;
   let session;
   let store;
   let authenticator;
   let container;
 
   beforeEach(function() {
+    sinon = sinonjs.sandbox.create();
     container = { lookup() {} };
     store = EphemeralStore.create();
     authenticator = Authenticator.create();
     session = createWithContainer(InternalSession, { store }, container);
     sinon.stub(container, 'lookup').withArgs('authenticator').returns(authenticator);
   });
 
+  afterEach(function() {
+    sinon.restore();
+  });
+
   it('does not allow data to be stored for the key "authenticated"', function() {
     expect(() => {
       session.set('authenticated', 'test');
@@ -381,21 +387,15 @@ describe('InternalSession', () => {
     });
 
     describe('when invalidate gets called with additional params', function() {
-      let spy;
-
       beforeEach(function() {
-        spy = sinon.spy(authenticator, 'invalidate');
+        sinon.spy(authenticator, 'invalidate');
       });
 
       it('passes the params on to the authenticators invalidate method', function() {
         let param = { some: 'random data' };
         session.invalidate(param);
         expect(authenticator.invalidate).to.have.been.calledWith(session.get('authenticated'), param);
       });
-
-      afterEach(function() {
-        spy.restore();
-      });
     });
 
     describe('when the authenticator resolves invalidation', function() {

tests/unit/mixins/application-route-mixin-test.js

@@ -2,20 +2,22 @@ import Route from '@ember/routing/route';
 import { next } from '@ember/runloop';
 import { describe, beforeEach, it } from 'mocha';
 import { expect } from 'chai';
-import sinon from 'sinon';
+import sinonjs from 'sinon';
 import ApplicationRouteMixin from 'ember-simple-auth/mixins/application-route-mixin';
 import InternalSession from 'ember-simple-auth/internal-session';
 import EphemeralStore from 'ember-simple-auth/session-stores/ephemeral';
 
 import createWithContainer from '../../helpers/create-with-container';
 
 describe('ApplicationRouteMixin', () => {
+  let sinon;
   let session;
   let route;
   let cookiesMock;
   let containerMock;
 
   beforeEach(function() {
+    sinon = sinonjs.sandbox.create();
     session = InternalSession.create({ store: EphemeralStore.create() });
     cookiesMock = {
       read: sinon.stub(),
@@ -32,6 +34,10 @@ describe('ApplicationRouteMixin', () => {
     }), { session }, containerMock);
   });
 
+  afterEach(function() {
+    sinon.restore();
+  });
+
   describe('mapping of service events to route methods', function() {
     beforeEach(function() {
       sinon.spy(route, 'sessionAuthenticated');

tests/unit/mixins/authenticated-route-mixin-test.js

@@ -3,7 +3,7 @@ import RSVP from 'rsvp';
 import Route from '@ember/routing/route';
 import { describe, beforeEach, it } from 'mocha';
 import { expect } from 'chai';
-import sinon from 'sinon';
+import sinonjs from 'sinon';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 import InternalSession from 'ember-simple-auth/internal-session';
 import Configuration from 'ember-simple-auth/configuration';
@@ -12,13 +12,22 @@ import EphemeralStore from 'ember-simple-auth/session-stores/ephemeral';
 import createWithContainer from '../../helpers/create-with-container';
 
 describe('AuthenticatedRouteMixin', () => {
+  let sinon;
   let route;
   let session;
   let transition;
   let cookiesMock;
   let fastbootMock;
   let containerMock;
 
+  beforeEach(function() {
+    sinon = sinonjs.sandbox.create();
+  });
+
+  afterEach(function() {
+    sinon.restore();
+  });
+
   describe('#beforeModel', function() {
     beforeEach(function() {
       const MixinImplementingBeforeModel = Mixin.create({

tests/unit/mixins/data-adapter-mixin-test.js

@@ -1,16 +1,18 @@
 import EmberObject from '@ember/object';
 import { describe, beforeEach, it } from 'mocha';
 import { expect } from 'chai';
-import sinon from 'sinon';
+import sinonjs from 'sinon';
 import DataAdapterMixin from 'ember-simple-auth/mixins/data-adapter-mixin';
 
 describe('DataAdapterMixin', () => {
+  let sinon;
   let adapter;
   let sessionService;
   let hash;
   let Adapter;
 
   beforeEach(function() {
+    sinon = sinonjs.sandbox.create();
     hash = {};
     sessionService = EmberObject.create({
       authorize() {},
@@ -36,6 +38,10 @@ describe('DataAdapterMixin', () => {
     adapter = Adapter.create({ session: sessionService });
   });
 
+  afterEach(function() {
+    sinon.restore();
+  });
+
   describe('#ajaxOptions', function() {
     it('registers a beforeSend hook', function() {
       adapter.ajaxOptions();

tests/unit/mixins/oauth2-implicit-grant-callback-route-mixin-test.js

@@ -10,13 +10,20 @@ import OAuth2ImplicitGrantCallbackRouteMixin from 'ember-simple-auth/mixins/oaut
 import * as LocationUtil from 'ember-simple-auth/utils/location';
 
 describe('OAuth2ImplicitGrantCallbackRouteMixin', function() {
+  let sinon;
   let route;
   let session;
 
+  beforeEach(function() {
+    sinon = sinonjs.sandbox.create();
+  });
+
+  afterEach(function() {
+    sinon.restore();
+  });
+
   describe('#activate', function() {
-    let sinon;
     beforeEach(function() {
-      sinon = sinonjs.sandbox.create();
       session = EmberObject.extend({
         authenticate(authenticator, hash) {
           if (!isEmpty(hash.access_token)) {
@@ -36,9 +43,6 @@ describe('OAuth2ImplicitGrantCallbackRouteMixin', function() {
 
       sinon.spy(route, 'transitionTo');
     });
-    afterEach(function() {
-      sinon.restore();
-    });
 
     it('correctly passes the auth parameters if authentication succeeds', function(done) {
       // it isn't possible to stub window.location.hash so we stub a wrapper function instead

tests/unit/mixins/unauthenticated-route-mixin-test.js

@@ -3,17 +3,26 @@ import RSVP from 'rsvp';
 import Route from '@ember/routing/route';
 import { describe, beforeEach, it } from 'mocha';
 import { expect } from 'chai';
-import sinon from 'sinon';
+import sinonjs from 'sinon';
 import UnauthenticatedRouteMixin from 'ember-simple-auth/mixins/unauthenticated-route-mixin';
 import InternalSession from 'ember-simple-auth/internal-session';
 import EphemeralStore from 'ember-simple-auth/session-stores/ephemeral';
 import createWithContainer from '../../helpers/create-with-container';
 
 describe('UnauthenticatedRouteMixin', () => {
+  let sinon;
   let route;
   let session;
   let containerMock;
 
+  beforeEach(function() {
+    sinon = sinonjs.sandbox.create();
+  });
+
+  afterEach(function() {
+    sinon.restore();
+  });
+
   describe('#beforeModel', function() {
     beforeEach(function() {
       const MixinImplementingBeforeModel = Mixin.create({