From eea9101478c2b53eb08a01c2dc8c239337744d9e Mon Sep 17 00:00:00 2001 From: Mark Crisp Date: Mon, 15 Jun 2020 11:32:09 -0400 Subject: [PATCH] remove sinon --- lib/index.test.js | 22 ++++------- package-lock.json | 95 ----------------------------------------------- package.json | 3 +- 3 files changed, 9 insertions(+), 111 deletions(-) diff --git a/lib/index.test.js b/lib/index.test.js index dcf2e79..18f6d21 100644 --- a/lib/index.test.js +++ b/lib/index.test.js @@ -4,7 +4,6 @@ const http = require('http'); const https = require('https'); const axios = require('axios').default; const { promisify } = require('util'); -const sinon = require('sinon'); const pem = require('pem'); const KeepAliveHttpAgent = require('agentkeepalive'); const index = require('.'); @@ -16,13 +15,7 @@ const serverCreators = { https }; -const sandbox = sinon.createSandbox(); - describe('lib/index', () => { - afterEach(() => { - sandbox.restore(); - }); - describe('validation', () => { test('should throw error when not passed arguments', () => { expect(() => index.createServerTerminator()).toThrow(); @@ -124,7 +117,7 @@ describe('lib/index', () => { test('server with active request is terminated safely', async () => { let setHeader; const server = createServer(options, (req, res) => { - setHeader = sandbox.spy(res, 'setHeader'); + setHeader = jest.spyOn(res, 'setHeader'); setTimeout(() => { res.end('ok'); }, 1000); @@ -147,14 +140,14 @@ describe('lib/index', () => { expect(result.status).toBe(200); await terminatePromise; expect(server.listening).toBe(false); - expect(setHeader.callCount).toBe(1); + expect(setHeader.mock.calls.length).toBe(1); }); test('server with active request and headers already sent is not sent additional headers', async () => { let setHeader; const server = createServer(options, (req, res) => { - setHeader = sandbox.spy(res, 'setHeader'); - sandbox.stub(res, 'headersSent').value(true); + setHeader = jest.spyOn(res, 'setHeader'); + jest.spyOn(res, 'headersSent', 'get').mockReturnValue(true); setTimeout(() => { res.end('ok'); }, 1000); @@ -178,7 +171,7 @@ describe('lib/index', () => { expect(result.status).toBe(200); await terminatePromise; expect(server.listening).toBe(false); - expect(setHeader.callCount).toBe(0); + expect(setHeader.mock.calls.length).toBe(0); }); test('server with active request is terminated forcefully if exceeds timeout', async () => { @@ -217,7 +210,7 @@ describe('lib/index', () => { }); expect(server.listening).toBe(true); const realServerClose = server.close.bind(server); - sandbox.stub(server, 'close').callsFake(async () => { + jest.spyOn(server, 'close').mockImplementation(async () => { await new Promise(resolve => realServerClose(resolve)); }); const terminate = index.createServerTerminator(server, { timeout }); @@ -236,7 +229,8 @@ describe('lib/index', () => { }); expect(server.listening).toBe(true); const realServerClose = server.close.bind(server); - sandbox.stub(server, 'close').callsFake(async fn => { + + jest.spyOn(server, 'close').mockImplementation(async fn => { await new Promise(resolve => realServerClose(resolve)); fn(new Error('error on closing')); }); diff --git a/package-lock.json b/package-lock.json index ecb1fa1..2f8ab70 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1076,33 +1076,6 @@ "@sinonjs/commons": "^1.7.0" } }, - "@sinonjs/formatio": { - "version": "5.0.1", - "resolved": "https://artifactory.lifion.oneadp.com:443/artifactory/api/npm/ohcm-npms/@sinonjs/formatio/-/formatio-5.0.1.tgz", - "integrity": "sha1-8T5xPLMxOxq5ZZAbAbCCjqa3cIk=", - "dev": true, - "requires": { - "@sinonjs/commons": "^1", - "@sinonjs/samsam": "^5.0.2" - } - }, - "@sinonjs/samsam": { - "version": "5.0.3", - "resolved": "https://artifactory.lifion.oneadp.com:443/artifactory/api/npm/ohcm-npms/@sinonjs/samsam/-/samsam-5.0.3.tgz", - "integrity": "sha1-hvIb2z1SSA+vCJKkgMmQaqWlKTg=", - "dev": true, - "requires": { - "@sinonjs/commons": "^1.6.0", - "lodash.get": "^4.4.2", - "type-detect": "^4.0.8" - } - }, - "@sinonjs/text-encoding": { - "version": "0.7.1", - "resolved": "https://artifactory.lifion.oneadp.com:443/artifactory/api/npm/ohcm-npms/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz", - "integrity": "sha1-jaXGUwkVZT86Hzj9XxAdjD+AecU=", - "dev": true - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2719,12 +2692,6 @@ "integrity": "sha1-V29d/GOuGhkv8ZLYrTr2MImRtlE=", "dev": true }, - "diff": { - "version": "4.0.2", - "resolved": "https://artifactory.lifion.oneadp.com:443/artifactory/api/npm/ohcm-npms/diff/-/diff-4.0.2.tgz", - "integrity": "sha1-YPOuy4nV+uUgwRqhnvwruYKq3n0=", - "dev": true - }, "diff-sequences": { "version": "26.0.0", "resolved": "https://artifactory.lifion.oneadp.com:443/artifactory/api/npm/ohcm-npms/diff-sequences/-/diff-sequences-26.0.0.tgz", @@ -6703,12 +6670,6 @@ "verror": "1.10.0" } }, - "just-extend": { - "version": "4.1.0", - "resolved": "https://artifactory.lifion.oneadp.com:443/artifactory/api/npm/ohcm-npms/just-extend/-/just-extend-4.1.0.tgz", - "integrity": "sha1-cnikAn2IlgFkDuDODloAuZJGfaQ=", - "dev": true - }, "kind-of": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", @@ -7385,19 +7346,6 @@ "integrity": "sha1-ozeKdpbOfSI+iPybdkvX7xCJ42Y=", "dev": true }, - "nise": { - "version": "4.0.3", - "resolved": "https://artifactory.lifion.oneadp.com:443/artifactory/api/npm/ohcm-npms/nise/-/nise-4.0.3.tgz", - "integrity": "sha1-n3n/AvoALtX/vFOK1YUY+gEdyRM=", - "dev": true, - "requires": { - "@sinonjs/commons": "^1.7.0", - "@sinonjs/fake-timers": "^6.0.0", - "@sinonjs/text-encoding": "^0.7.1", - "just-extend": "^4.0.2", - "path-to-regexp": "^1.7.0" - } - }, "node-fetch": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", @@ -7885,23 +7833,6 @@ "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", "dev": true }, - "path-to-regexp": { - "version": "1.8.0", - "resolved": "https://artifactory.lifion.oneadp.com:443/artifactory/api/npm/ohcm-npms/path-to-regexp/-/path-to-regexp-1.8.0.tgz", - "integrity": "sha1-iHs7qdhDk+h6CgufTLdWGYtTVIo=", - "dev": true, - "requires": { - "isarray": "0.0.1" - }, - "dependencies": { - "isarray": { - "version": "0.0.1", - "resolved": "https://artifactory.lifion.oneadp.com:443/artifactory/api/npm/ohcm-npms/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - } - } - }, "path-type": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", @@ -8636,32 +8567,6 @@ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true }, - "sinon": { - "version": "9.0.2", - "resolved": "https://artifactory.lifion.oneadp.com:443/artifactory/api/npm/ohcm-npms/sinon/-/sinon-9.0.2.tgz", - "integrity": "sha1-uQF+JGM/SxyY37bnhKXwUJ9f2F0=", - "dev": true, - "requires": { - "@sinonjs/commons": "^1.7.2", - "@sinonjs/fake-timers": "^6.0.1", - "@sinonjs/formatio": "^5.0.1", - "@sinonjs/samsam": "^5.0.3", - "diff": "^4.0.2", - "nise": "^4.0.1", - "supports-color": "^7.1.0" - }, - "dependencies": { - "@sinonjs/commons": { - "version": "1.8.0", - "resolved": "https://artifactory.lifion.oneadp.com:443/artifactory/api/npm/ohcm-npms/@sinonjs/commons/-/commons-1.8.0.tgz", - "integrity": "sha1-yNaIIahUxVW7oXLzsGlZoAObI20=", - "dev": true, - "requires": { - "type-detect": "4.0.8" - } - } - } - }, "sisteransi": { "version": "1.0.5", "resolved": "https://artifactory.lifion.oneadp.com:443/artifactory/api/npm/ohcm-npms/sisteransi/-/sisteransi-1.0.5.tgz", diff --git a/package.json b/package.json index e8cf701..a8332ea 100644 --- a/package.json +++ b/package.json @@ -51,8 +51,7 @@ "npm-watch": "^0.6.0", "pem": "^1.14.4", "prettier": "^1.19.1", - "semver": "^7.3.2", - "sinon": "^9.0.2" + "semver": "^7.3.2" }, "husky": { "hooks": {