Use global object detection from @sinonjs/commons

sinonjs · Dec 19, 2019 · f34a13e · f34a13e
1 parent e8cb75c
commit f34a13e
Show file tree

Hide file tree

Showing 5 changed files with 1,865 additions and 2,477 deletions.
diff --git a/lib/sinon/assert.js b/lib/sinon/assert.js
@@ -7,8 +7,8 @@ var orderByFirstCall = require("@sinonjs/commons").orderByFirstCall;
 var timesInWords = require("./util/core/times-in-words");
 var format = require("./util/core/format");
 var stringSlice = require("@sinonjs/commons").prototypes.string.slice;
+var globalObject = require("@sinonjs/commons").global;
 
-var globalContext = typeof global !== "undefined" ? global : window;
 var arraySlice = arrayProto.slice;
 var concat = arrayProto.concat;
 var forEach = arrayProto.forEach;
@@ -61,7 +61,7 @@ function verifyIsValidAssertion(assertionMethod, assertionArgs) {
 }
 
 function failAssertion(object, msg) {
-    var obj = object || globalContext;
+    var obj = object || globalObject;
     var failMethod = obj.fail || assert.fail;
     failMethod.call(obj, msg);
 }

diff --git a/lib/sinon/util/core/next-tick.js b/lib/sinon/util/core/next-tick.js
@@ -1,8 +1,6 @@
 "use strict";
 
+var globalObject = require("@sinonjs/commons").global;
 var getNextTick = require("./get-next-tick");
 
-/* istanbul ignore next */
-var root = typeof window !== "undefined" ? window : global;
-
-module.exports = getNextTick(root.process, root.setImmediate);
+module.exports = getNextTick(globalObject.process, globalObject.setImmediate);
diff --git a/lib/sinon/util/fake-timers.js b/lib/sinon/util/fake-timers.js
@@ -2,7 +2,7 @@
 
 var extend = require("./core/extend");
 var llx = require("lolex");
-var globalContext = typeof global !== "undefined" ? global : window;
+var globalObject = require("@sinonjs/commons").global;
 
 function createClock(config, globalCtx) {
     var llxCtx = llx;
@@ -15,7 +15,7 @@ function createClock(config, globalCtx) {
 }
 
 function addIfDefined(obj, globalPropName) {
-    var globalProp = globalContext[globalPropName];
+    var globalProp = globalObject[globalPropName];
     if (typeof globalProp !== "undefined") {
         obj[globalPropName] = globalProp;
     }