Merge pull request #108 from sinonjs/lolex-5-and-no-globals

Ugrade lolex to v5 and don't detect globals
sinonjs · Oct 14, 2019 · 1a3eedd · 1a3eedd
2 parents ff9b43d + 0a81369
commit 1a3eedd
Show file tree

Hide file tree

Showing 7 changed files with 109 additions and 66 deletions.
diff --git a/lib/fake-server/fake-server-with-clock.test.js b/lib/fake-server/fake-server-with-clock.test.js
@@ -1,7 +1,6 @@
 "use strict";
 
 var JSDOM = require("jsdom").JSDOM;
-var DOMParser = new JSDOM().window.DOMParser;
 var referee = require("@sinonjs/referee");
 var setupDOM = require("jsdom-global");
 var sinon = require("sinon");
@@ -11,20 +10,30 @@ var sinonFakeServer = require("./index");
 
 var lolex = require("lolex");
 var FakeXMLHttpRequest = require("../fake-xhr").FakeXMLHttpRequest;
+
+var JSDOMParser;
+if (JSDOM) {
+    JSDOMParser = new JSDOM().window.DOMParser;
+}
+
 var assert = referee.assert;
 var refute = referee.refute;
 
 var globalSetTimeout = setTimeout;
 
 describe("fakeServerWithClock", function () {
     beforeEach(function () {
-        global.DOMParser = DOMParser;
-        this.cleanupDOM = setupDOM();
+        if (JSDOMParser) {
+            global.DOMParser = JSDOMParser;
+            this.cleanupDOM = setupDOM();
+        }
     });
 
     afterEach(function () {
-        delete global.DOMParser;
-        this.cleanupDOM();
+        if (JSDOMParser) {
+            delete global.DOMParser;
+            this.cleanupDOM();
+        }
     });
 
     describe("without pre-existing fake clock", function () {

diff --git a/lib/fake-server/index.test.js b/lib/fake-server/index.test.js
@@ -6,27 +6,35 @@ var JSDOM = require("jsdom").JSDOM;
 var sinon = require("sinon");
 var sinonFakeServer = require("./index");
 var fakeXhr = require("../fake-xhr/");
-var DOMParser = new JSDOM().window.DOMParser;
 var FakeXMLHttpRequest = fakeXhr.FakeXMLHttpRequest;
 
+var JSDOMParser;
+if (JSDOM) {
+    JSDOMParser = new JSDOM().window.DOMParser;
+}
+
 var assert = referee.assert;
 var refute = referee.refute;
 
 var supportsArrayBuffer = typeof ArrayBuffer !== "undefined";
 
 describe("sinonFakeServer", function () {
     beforeEach(function () {
-        global.DOMParser = DOMParser;
-        this.cleanupDOM = setupDOM();
+        if (JSDOMParser) {
+            global.DOMParser = JSDOMParser;
+            this.cleanupDOM = setupDOM();
+        }
     });
 
     afterEach(function () {
         if (this.server) {
             this.server.restore();
         }
 
-        delete global.DOMParser;
-        this.cleanupDOM();
+        if (JSDOMParser) {
+            delete global.DOMParser;
+            this.cleanupDOM();
+        }
     });
 
     it("provides restore method", function () {

diff --git a/lib/fake-xhr/index.js b/lib/fake-xhr/index.js
@@ -1,6 +1,8 @@
 "use strict";
 
-var TextEncoder = require("@sinonjs/text-encoding").TextEncoder;
+var GlobalTextEncoder = typeof TextEncoder !== "undefined"
+    ? TextEncoder
+    : require("@sinonjs/text-encoding").TextEncoder;
 
 var configureLogError = require("../configure-logger");
 var sinonEvent = require("../event");
@@ -119,7 +121,7 @@ function convertToArrayBuffer(body, encoding) {
         return body;
     }
 
-    return new TextEncoder(encoding || "utf-8").encode(body).buffer;
+    return new GlobalTextEncoder(encoding || "utf-8").encode(body).buffer;
 }
 
 function isXmlContentType(contentType) {
@@ -777,4 +779,7 @@ function fakeXMLHttpRequestFor(globalScope) {
     };
 }
 
-module.exports = extend(fakeXMLHttpRequestFor(global), { fakeXMLHttpRequestFor: fakeXMLHttpRequestFor });
+var globalObject = typeof global !== "undefined" ? global : window;
+module.exports = extend(fakeXMLHttpRequestFor(globalObject), {
+    fakeXMLHttpRequestFor: fakeXMLHttpRequestFor
+});
diff --git a/lib/fake-xhr/index.test.js b/lib/fake-xhr/index.test.js
@@ -1,3 +1,4 @@
+/*global ActiveXObject*/
 "use strict";
 
 var referee = require("@sinonjs/referee");
@@ -9,12 +10,15 @@ var sinon = require("sinon");
 var extend = require("just-extend");
 var JSDOM = require("jsdom").JSDOM;
 
-var TextEncoder = global.TextEncoder || require("@sinonjs/text-encoding").TextEncoder;
-var DOMParser = new JSDOM().window.DOMParser;
+var GlobalTextEncoder = typeof TextEncoder !== "undefined"
+    ? TextEncoder
+    : require("@sinonjs/text-encoding").TextEncoder;
 var assert = referee.assert;
 var refute = referee.refute;
 
-var globalActiveXObject = global.ActiveXObject;
+var globalActiveXObject = typeof ActiveXObject !== "undefined"
+    ? ActiveXObject
+    : undefined;
 
 var supportsFormData = typeof FormData !== "undefined";
 var supportsArrayBuffer = typeof ArrayBuffer !== "undefined";
@@ -25,7 +29,12 @@ var setupDOM = require("jsdom-global");
 var globalXMLHttpRequest,
     sinonFakeXhr,
     FakeXMLHttpRequest,
-    fakeXhr;
+    fakeXhr,
+    JSDOMParser;
+
+if (JSDOM) {
+    JSDOMParser = new JSDOM().window.DOMParser;
+}
 
 function fakeXhrSetUp() {
     fakeXhr = sinonFakeXhr.useFakeXMLHttpRequest();
@@ -243,16 +252,20 @@ function loadModule() {
 
 describe("FakeXMLHttpRequest", function () {
     beforeEach(function () {
-        global.DOMParser = DOMParser;
-        this.cleanupDOM = setupDOM();
+        if (JSDOMParser) {
+            global.DOMParser = JSDOMParser;
+            this.cleanupDOM = setupDOM();
+        }
         globalXMLHttpRequest = global.XMLHttpRequest;
         loadModule();
     });
 
     afterEach(function () {
-        delete global.DOMParser;
         delete FakeXMLHttpRequest.onCreate;
-        this.cleanupDOM();
+        if (JSDOMParser) {
+            delete global.DOMParser;
+            this.cleanupDOM();
+        }
     });
 
     it("is constructor", function () {
@@ -1582,7 +1595,7 @@ describe("FakeXMLHttpRequest", function () {
 
                     this.xhr.respond(200, { "Content-Type": "application/octet-stream" }, "a test buffer");
 
-                    var expected = new TextEncoder("utf-8").encode("a test buffer").buffer;
+                    var expected = new GlobalTextEncoder("utf-8").encode("a test buffer").buffer;
                     assertArrayBufferMatches(this.xhr.response, expected);
                 });
 
@@ -1593,7 +1606,7 @@ describe("FakeXMLHttpRequest", function () {
 
                     this.xhr.respond(200, { "Content-Type": "application/octet-stream" }, "\xFF");
 
-                    var expectedBuffer = new TextEncoder("utf-8").encode("\xFF").buffer;
+                    var expectedBuffer = new GlobalTextEncoder("utf-8").encode("\xFF").buffer;
 
                     assertArrayBufferMatches(this.xhr.response, expectedBuffer);
                 });
@@ -2561,11 +2574,13 @@ describe("FakeXMLHttpRequest", function () {
         var win;
 
         beforeEach(function () {
-            win = new JSDOM().window;
-            win.DOMParser = DOMParser;
-
+            if (JSDOM) {
+                win = new JSDOM().window;
+                win.DOMParser = JSDOMParser;
+            } else {
+                win = window;
+            }
             var scopedSinonFakeXhr = sinonFakeXhr.fakeXMLHttpRequestFor(win);
-
             globalXMLHttpRequest = win.XMLHttpRequest;
             fakeXhr = scopedSinonFakeXhr.useFakeXMLHttpRequest();
             FakeXMLHttpRequest = scopedSinonFakeXhr.FakeXMLHttpRequest;

diff --git a/package-lock.json b/package-lock.json