don't destructure Ember.testing

mainmatter · Nov 14, 2017 · 6d2dd7b · 6d2dd7b
1 parent 89094c2
commit 6d2dd7b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/addon/authenticators/oauth2-password-grant.js b/addon/authenticators/oauth2-password-grant.js
@@ -13,7 +13,6 @@ import Ember from 'ember';
 import BaseAuthenticator from './base';
 import fetch from 'fetch';
 
-const { testing } = Ember;
 const assign = emberAssign || merge;
 const keys = Object.keys || emberKeys; // Ember.keys deprecated in 1.13
 
@@ -347,7 +346,7 @@ export default BaseAuthenticator.extend({
       if (!isEmpty(refreshToken) && !isEmpty(expiresAt) && expiresAt > now - offset) {
         run.cancel(this._refreshTokenTimeout);
         delete this._refreshTokenTimeout;
-        if (!testing) {
+        if (!Ember.testing) {
           this._refreshTokenTimeout = run.later(this, this._refreshAccessToken, expiresIn, refreshToken, expiresAt - now - offset);
         }
       }

diff --git a/addon/mixins/application-route-mixin.js b/addon/mixins/application-route-mixin.js
@@ -7,8 +7,6 @@ import { inject } from '@ember/service';
 import Ember from 'ember';
 import Configuration from './../configuration';
 
-const { testing } = Ember;
-
 /**
   The mixin for the application route, __defining methods that are called when
   the session is successfully authenticated (see
@@ -139,7 +137,7 @@ export default Mixin.create({
     @public
   */
   sessionInvalidated() {
-    if (!testing) {
+    if (!Ember.testing) {
       if (this.get('_isFastBoot')) {
         this.transitionTo(Configuration.baseURL);
       } else {

diff --git a/addon/session-stores/cookie.js b/addon/session-stores/cookie.js
@@ -10,8 +10,6 @@ import Ember from 'ember';
 import BaseStore from './base';
 import objectsAreEqual from '../utils/objects-are-equal';
 
-const { testing } = Ember;
-
 const persistingProperty = function(beforeSet = function() {}) {
   return computed({
     get(key) {
@@ -253,7 +251,7 @@ export default BaseStore.extend({
         this._lastData = data;
         this.trigger('sessionDataUpdated', data);
       }
-      if (!testing) {
+      if (!Ember.testing) {
         cancel(this._syncDataTimeout);
         this._syncDataTimeout = later(this, this._syncData, 500);
       }
@@ -271,7 +269,7 @@ export default BaseStore.extend({
   },
 
   _renewExpiration() {
-    if (!testing) {
+    if (!Ember.testing) {
       cancel(this._renewExpirationTimeout);
       this._renewExpirationTimeout = later(this, this._renewExpiration, 60000);
     }