Skip to content

Commit

Permalink
Fixup: bad rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
mroderick committed Jan 16, 2018
1 parent 9f9e7bd commit 4894ce9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion lib/sinon/sandbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ var sinonStub = require("./stub");
var valueToString = require("./util/core/value-to-string");
var fakeServer = require("nise").fakeServer;
var fakeXhr = require("nise").fakeXhr;
var fakeServerWithClock = require("nise").fakeServerWithClock;
var usePromiseLibrary = require("./util/core/use-promise-library");

// cache original versions, to prevent issues when they are stubbed in user space
Expand Down
4 changes: 2 additions & 2 deletions test/sandbox-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -1128,13 +1128,13 @@ describe("Sandbox", function () {
});

it("uses fakeServer as the serverPrototype by default", function () {
var sandbox = sinonSandbox.create();
var sandbox = createSandbox();

assert.same(sandbox.serverPrototype, fakeServer);
});

it("uses configured implementation as the serverPrototype", function () {
var sandbox = sinonSandbox.create({
var sandbox = createSandbox({
useFakeServer: fakeServerWithClock
});

Expand Down

0 comments on commit 4894ce9

Please sign in to comment.