Use nise.fakeServer as the sandbox serverPrototype

The fakeServerWithClock was used which caused fake timers to be installed on the first XHR request. Fixes #1534
sinonjs · Jan 13, 2018 · bb5529b · bb5529b
1 parent ef81c37
commit bb5529b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/lib/sinon/sandbox.js b/lib/sinon/sandbox.js
@@ -7,7 +7,6 @@ var sinonAssert = require("./assert");
 var sinonClock = require("./util/fake_timers");
 var fakeServer = require("nise").fakeServer;
 var fakeXhr = require("nise").fakeXhr;
-var fakeServerWithClock = require("nise").fakeServerWithClock;
 
 var push = [].push;
 
@@ -55,7 +54,7 @@ extend(sinonSandbox, {
         return this.add(this.clock);
     },
 
-    serverPrototype: fakeServerWithClock,
+    serverPrototype: fakeServer,
 
     useFakeServer: function useFakeServer() {
         var proto = this.serverPrototype || fakeServer;

diff --git a/test/sandbox-test.js b/test/sandbox-test.js
@@ -257,7 +257,13 @@ describe("sinonSandbox", function () {
                     assert(fakeServer.isPrototypeOf(server));
                 });
 
-                it("creates server with cock", function () {
+                it("creates server without clock by default", function () {
+                    var server = this.sandbox.useFakeServer();
+
+                    refute(fakeServerWithClock.isPrototypeOf(server));
+                });
+
+                it("creates server with clock", function () {
                     this.sandbox.serverPrototype = fakeServerWithClock;
                     var server = this.sandbox.useFakeServer();
 
@@ -472,6 +478,20 @@ describe("sinonSandbox", function () {
                     sandbox.restore();
                 });
 
+                it("uses fakeServer as the serverPrototype by default", function () {
+                    var sandbox = sinonSandbox.create();
+
+                    assert.same(sandbox.serverPrototype, fakeServer);
+                });
+
+                it("uses configured implementation as the serverPrototype", function () {
+                    var sandbox = sinonSandbox.create({
+                        useFakeServer: fakeServerWithClock
+                    });
+
+                    assert.same(sandbox.serverPrototype, fakeServerWithClock);
+                });
+
                 it("yields clock when faking timers", function () {
                     var sandbox = sinonSandbox.create(sinonConfig({
                         injectIntoThis: false,