From b491a5719e849009c0123765cba3243f26b3c6ef Mon Sep 17 00:00:00 2001 From: Morgan Roderick Date: Sat, 3 Mar 2018 17:25:52 +0000 Subject: [PATCH] Replace referee dependency with @sinonjs/referee --- package-lock.json | 64 +++++++++++++------ package.json | 2 +- test/assert-test.js | 2 +- test/behavior-test.js | 2 +- test/call-test.js | 2 +- test/collection-test.js | 2 +- test/extend-test.js | 2 +- test/issues/issues-test.js | 2 +- test/match-test.js | 2 +- test/mock-test.js | 2 +- test/sandbox-test.js | 2 +- test/sinon-test.js | 2 +- test/spy-test.js | 2 +- test/stub-test.js | 2 +- test/test-helper.js | 2 +- test/util/core/called-in-order-test.js | 2 +- test/util/core/color-test.js | 2 +- test/util/core/deep-equal-test.js | 2 +- test/util/core/every-test.js | 2 +- test/util/core/format-test.js | 2 +- test/util/core/function-to-string-test.js | 2 +- test/util/core/get-config-test.js | 2 +- test/util/core/iterable-to-string-test.js | 2 +- test/util/core/restore-test.js | 2 +- test/util/core/times-in-words-test.js | 2 +- test/util/core/typeOf-test.js | 2 +- test/util/core/value-to-string-test.js | 2 +- test/util/core/walk-test.js | 2 +- test/util/core/wrap-method-test.js | 2 +- test/util/fake-timers-test.js | 2 +- .../webworker/webworker-support-assessment.js | 2 +- 31 files changed, 75 insertions(+), 49 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2fb41e3bf..81ac9f5fd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,6 +36,29 @@ } } }, + "@sinonjs/referee": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@sinonjs/referee/-/referee-2.0.0.tgz", + "integrity": "sha512-inOh34xub2/0diAWHrAZuakWe1NhtR2DkOXoS/3N7ooddxRZCxTH3TWyI4q7GatFGh+vmPCdWhws/1fziVdPhA==", + "dev": true, + "requires": { + "array.from": "1.0.3", + "bane": "1.1.2", + "es6-promise": "4.2.4", + "lodash.includes": "4.3.0", + "lodash.isarguments": "3.1.0", + "object-assign": "4.1.1", + "samsam": "1.2.1" + }, + "dependencies": { + "es6-promise": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz", + "integrity": "sha512-/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==", + "dev": true + } + } + }, "JSONStream": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz", @@ -259,6 +282,16 @@ "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", "dev": true }, + "array.from": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array.from/-/array.from-1.0.3.tgz", + "integrity": "sha1-y1hqrZIGfzQSKfQeDtZDKB26Vrc=", + "dev": true, + "requires": { + "define-properties": "1.1.2", + "es-abstract": "1.8.2" + } + }, "arrify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", @@ -4080,6 +4113,18 @@ "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=" }, + "lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=", + "dev": true + }, + "lodash.isarguments": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", + "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=", + "dev": true + }, "lodash.memoize": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz", @@ -5613,25 +5658,6 @@ "set-immediate-shim": "1.0.1" } }, - "referee": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/referee/-/referee-1.2.0.tgz", - "integrity": "sha1-eneb7llVx4r/fYjAFhxaH0VFjJA=", - "dev": true, - "requires": { - "bane": "1.1.2", - "lodash": "3.10.1", - "samsam": "1.2.1" - }, - "dependencies": { - "lodash": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", - "dev": true - } - } - }, "regex-cache": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", diff --git a/package.json b/package.json index 1609597f3..03d47c6c8 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "type-detect": "^4.0.5" }, "devDependencies": { + "@sinonjs/referee": "^2.0.0", "browserify": "^15.1.0", "dependency-check": "^2.9.1", "eslint": "^4.6.1", @@ -63,7 +64,6 @@ "proxyquire": "^1.8.0", "proxyquire-universal": "^1.0.8", "proxyquireify": "^3.2.1", - "referee": "^1.2.0", "rimraf": "^2.5.3", "samsam": "^1.1.3" }, diff --git a/test/assert-test.js b/test/assert-test.js index 0e30f0c6e..960d8fd66 100644 --- a/test/assert-test.js +++ b/test/assert-test.js @@ -1,7 +1,7 @@ "use strict"; var color = require("../lib/sinon/color"); -var referee = require("referee"); +var referee = require("@sinonjs/referee"); var sinonStub = require("../lib/sinon/stub"); var sinonSpy = require("../lib/sinon/spy"); var sinonAssert = require("../lib/sinon/assert"); diff --git a/test/behavior-test.js b/test/behavior-test.js index c92719c74..5fb7ac20b 100644 --- a/test/behavior-test.js +++ b/test/behavior-test.js @@ -2,7 +2,7 @@ var createStub = require("../lib/sinon/stub"); var addBehavior = require("../lib/sinon").addBehavior; -var assert = require("referee").assert; +var assert = require("@sinonjs/referee").assert; describe("behaviors", function () { it("adds and uses a custom behavior", function () { diff --git a/test/call-test.js b/test/call-test.js index 56d56f3b0..aa602c0d9 100644 --- a/test/call-test.js +++ b/test/call-test.js @@ -1,6 +1,6 @@ "use strict"; -var referee = require("referee"); +var referee = require("@sinonjs/referee"); var sinonSpyCall = require("../lib/sinon/call"); var sinonSpy = require("../lib/sinon/spy"); var sinonStub = require("../lib/sinon/stub"); diff --git a/test/collection-test.js b/test/collection-test.js index 589fbe09c..16dd9ce36 100644 --- a/test/collection-test.js +++ b/test/collection-test.js @@ -1,6 +1,6 @@ "use strict"; -var referee = require("referee"); +var referee = require("@sinonjs/referee"); var sinonCollection = require("../lib/sinon/collection"); var sinonSpy = require("../lib/sinon/spy"); var sinonStub = require("../lib/sinon/stub"); diff --git a/test/extend-test.js b/test/extend-test.js index f81976609..7d0e3d4a8 100644 --- a/test/extend-test.js +++ b/test/extend-test.js @@ -1,6 +1,6 @@ "use strict"; -var referee = require("referee"); +var referee = require("@sinonjs/referee"); var extend = require("../lib/sinon/util/core/extend"); var assert = referee.assert; diff --git a/test/issues/issues-test.js b/test/issues/issues-test.js index 5850fbc09..4d8cd25c2 100644 --- a/test/issues/issues-test.js +++ b/test/issues/issues-test.js @@ -1,6 +1,6 @@ "use strict"; -var referee = require("referee"); +var referee = require("@sinonjs/referee"); var sinon = require("../../lib/sinon"); var createStub = require("../../lib/sinon/stub"); var assert = referee.assert; diff --git a/test/match-test.js b/test/match-test.js index 380f5faa7..2db3d3374 100644 --- a/test/match-test.js +++ b/test/match-test.js @@ -1,6 +1,6 @@ "use strict"; -var referee = require("referee"); +var referee = require("@sinonjs/referee"); var assert = referee.assert; var refute = referee.refute; var sinonMatch = require("../lib/sinon/match"); diff --git a/test/mock-test.js b/test/mock-test.js index e13b50154..733147751 100644 --- a/test/mock-test.js +++ b/test/mock-test.js @@ -1,6 +1,6 @@ "use strict"; -var referee = require("referee"); +var referee = require("@sinonjs/referee"); var sinonMock = require("../lib/sinon/mock"); var sinonExpectation = require("../lib/sinon/mock-expectation"); var sinonMatch = require("../lib/sinon/match"); diff --git a/test/sandbox-test.js b/test/sandbox-test.js index 16cffd1a3..124b22083 100644 --- a/test/sandbox-test.js +++ b/test/sandbox-test.js @@ -1,6 +1,6 @@ "use strict"; -var referee = require("referee"); +var referee = require("@sinonjs/referee"); var samsam = require("samsam"); var assert = referee.assert; var refute = referee.refute; diff --git a/test/sinon-test.js b/test/sinon-test.js index cbf456acd..ee99e260c 100644 --- a/test/sinon-test.js +++ b/test/sinon-test.js @@ -1,6 +1,6 @@ "use strict"; -var assert = require("referee").assert; +var assert = require("@sinonjs/referee").assert; var hasPromise = typeof Promise === "function"; if (!hasPromise) { diff --git a/test/spy-test.js b/test/spy-test.js index a6f22c0ac..813fb0b07 100644 --- a/test/spy-test.js +++ b/test/spy-test.js @@ -1,6 +1,6 @@ "use strict"; -var referee = require("referee"); +var referee = require("@sinonjs/referee"); var createSpy = require("../lib/sinon/spy"); var sinonMatch = require("../lib/sinon/match"); var assert = referee.assert; diff --git a/test/stub-test.js b/test/stub-test.js index 7123ef597..5b8e8628b 100644 --- a/test/stub-test.js +++ b/test/stub-test.js @@ -1,6 +1,6 @@ "use strict"; -var referee = require("referee"); +var referee = require("@sinonjs/referee"); var createStub = require("../lib/sinon/stub"); var createStubInstance = require("../lib/sinon/stub").createStubInstance; var createSpy = require("../lib/sinon/spy"); diff --git a/test/test-helper.js b/test/test-helper.js index cf593bdf8..a0118b5b4 100644 --- a/test/test-helper.js +++ b/test/test-helper.js @@ -1,6 +1,6 @@ "use strict"; -var referee = require("referee"); +var referee = require("@sinonjs/referee"); referee.add("spy", { assert: function (obj) { diff --git a/test/util/core/called-in-order-test.js b/test/util/core/called-in-order-test.js index f9428168d..a19df7918 100644 --- a/test/util/core/called-in-order-test.js +++ b/test/util/core/called-in-order-test.js @@ -1,6 +1,6 @@ "use strict"; -var referee = require("referee"); +var referee = require("@sinonjs/referee"); var calledInOrder = require("../../../lib/sinon/util/core/called-in-order"); var sinonStub = require("../../../lib/sinon/stub"); var assert = referee.assert; diff --git a/test/util/core/color-test.js b/test/util/core/color-test.js index cdf0341e1..0426089bc 100644 --- a/test/util/core/color-test.js +++ b/test/util/core/color-test.js @@ -1,6 +1,6 @@ "use strict"; -var assert = require("referee").assert; +var assert = require("@sinonjs/referee").assert; var proxyquire = require("proxyquire"); function getColorMethods() { diff --git a/test/util/core/deep-equal-test.js b/test/util/core/deep-equal-test.js index 6fa685a61..8ede39e7e 100644 --- a/test/util/core/deep-equal-test.js +++ b/test/util/core/deep-equal-test.js @@ -1,6 +1,6 @@ "use strict"; -var referee = require("referee"); +var referee = require("@sinonjs/referee"); var deepEqual = require("../../../lib/sinon/util/core/deep-equal"); var match = require("../../../lib/sinon/match"); var createSpy = require("../../../lib/sinon/spy").create; diff --git a/test/util/core/every-test.js b/test/util/core/every-test.js index 549ef64f8..c309245b9 100644 --- a/test/util/core/every-test.js +++ b/test/util/core/every-test.js @@ -1,6 +1,6 @@ "use strict"; -var referee = require("referee"); +var referee = require("@sinonjs/referee"); var createSpy = require("../../../lib/sinon/spy"); var every = require("../../../lib/sinon/util/core/every"); var assert = referee.assert; diff --git a/test/util/core/format-test.js b/test/util/core/format-test.js index 68f25fd89..bc08b5440 100644 --- a/test/util/core/format-test.js +++ b/test/util/core/format-test.js @@ -1,6 +1,6 @@ "use strict"; -var referee = require("referee"); +var referee = require("@sinonjs/referee"); var sinon = require("../../../lib/sinon"); var format = require("../../../lib/sinon/util/core/format"); var assert = referee.assert; diff --git a/test/util/core/function-to-string-test.js b/test/util/core/function-to-string-test.js index 8f145919c..8ee68daf3 100644 --- a/test/util/core/function-to-string-test.js +++ b/test/util/core/function-to-string-test.js @@ -1,6 +1,6 @@ "use strict"; -var referee = require("referee"); +var referee = require("@sinonjs/referee"); var createSpy = require("../../../lib/sinon/spy"); var functionToString = require("../../../lib/sinon/util/core/function-to-string"); var assert = referee.assert; diff --git a/test/util/core/get-config-test.js b/test/util/core/get-config-test.js index f14b66650..736a88f12 100644 --- a/test/util/core/get-config-test.js +++ b/test/util/core/get-config-test.js @@ -1,6 +1,6 @@ "use strict"; -var referee = require("referee"); +var referee = require("@sinonjs/referee"); var getConfig = require("../../../lib/sinon/util/core/get-config"); var defaultConfig = require("../../../lib/sinon/util/core/default-config"); var assert = referee.assert; diff --git a/test/util/core/iterable-to-string-test.js b/test/util/core/iterable-to-string-test.js index 5bee0c9f1..683c44ab5 100644 --- a/test/util/core/iterable-to-string-test.js +++ b/test/util/core/iterable-to-string-test.js @@ -1,6 +1,6 @@ "use strict"; -var referee = require("referee"); +var referee = require("@sinonjs/referee"); var iterableToString = require("../../../lib/sinon/util/core/iterable-to-string"); var assert = referee.assert; diff --git a/test/util/core/restore-test.js b/test/util/core/restore-test.js index 1ed6b5e1e..2f971567c 100644 --- a/test/util/core/restore-test.js +++ b/test/util/core/restore-test.js @@ -1,6 +1,6 @@ "use strict"; -var referee = require("referee"); +var referee = require("@sinonjs/referee"); var restore = require("../../../lib/sinon/util/core/restore"); var createStub = require("../../../lib/sinon/stub"); var assert = referee.assert; diff --git a/test/util/core/times-in-words-test.js b/test/util/core/times-in-words-test.js index 94f4593c2..a57ae5599 100644 --- a/test/util/core/times-in-words-test.js +++ b/test/util/core/times-in-words-test.js @@ -1,6 +1,6 @@ "use strict"; -var referee = require("referee"); +var referee = require("@sinonjs/referee"); var timesInWords = require("../../../lib/sinon/util/core/times-in-words"); var assert = referee.assert; diff --git a/test/util/core/typeOf-test.js b/test/util/core/typeOf-test.js index bacee1eb9..458cf5b9b 100644 --- a/test/util/core/typeOf-test.js +++ b/test/util/core/typeOf-test.js @@ -1,6 +1,6 @@ "use strict"; -var referee = require("referee"); +var referee = require("@sinonjs/referee"); var sinonTypeOf = require("../../../lib/sinon/util/core/typeOf"); var assert = referee.assert; diff --git a/test/util/core/value-to-string-test.js b/test/util/core/value-to-string-test.js index 64a408070..5052feef2 100644 --- a/test/util/core/value-to-string-test.js +++ b/test/util/core/value-to-string-test.js @@ -1,6 +1,6 @@ "use strict"; -var referee = require("referee"); +var referee = require("@sinonjs/referee"); var valueToString = require("../../../lib/sinon/util/core/value-to-string"); var assert = referee.assert; diff --git a/test/util/core/walk-test.js b/test/util/core/walk-test.js index dcd93a64c..d81d63bf5 100644 --- a/test/util/core/walk-test.js +++ b/test/util/core/walk-test.js @@ -1,6 +1,6 @@ "use strict"; -var referee = require("referee"); +var referee = require("@sinonjs/referee"); var walk = require("../../../lib/sinon/util/core/walk"); var createSpy = require("../../../lib/sinon/spy"); var assert = referee.assert; diff --git a/test/util/core/wrap-method-test.js b/test/util/core/wrap-method-test.js index 3c484b67f..8e3a8dccf 100644 --- a/test/util/core/wrap-method-test.js +++ b/test/util/core/wrap-method-test.js @@ -1,6 +1,6 @@ "use strict"; -var referee = require("referee"); +var referee = require("@sinonjs/referee"); var wrapMethod = require("../../../lib/sinon/util/core/wrap-method"); var createSpy = require("../../../lib/sinon/spy"); var createStub = require("../../../lib/sinon/stub"); diff --git a/test/util/fake-timers-test.js b/test/util/fake-timers-test.js index 674d1b778..fffe46047 100644 --- a/test/util/fake-timers-test.js +++ b/test/util/fake-timers-test.js @@ -1,6 +1,6 @@ "use strict"; -var referee = require("referee"); +var referee = require("@sinonjs/referee"); var fakeTimers = require("../../lib/sinon/util/fake_timers"); var sinonStub = require("../../lib/sinon/stub"); var sinonSpy = require("../../lib/sinon/spy"); diff --git a/test/webworker/webworker-support-assessment.js b/test/webworker/webworker-support-assessment.js index 990150a2f..5ad422557 100644 --- a/test/webworker/webworker-support-assessment.js +++ b/test/webworker/webworker-support-assessment.js @@ -1,6 +1,6 @@ "use strict"; -var referee = require("referee"); +var referee = require("@sinonjs/referee"); var assert = referee.assert;