Skip to content

Commit

Permalink
remove sinon
Browse files Browse the repository at this point in the history
  • Loading branch information
crispmark committed Jun 15, 2020
1 parent cb9db85 commit eea9101
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 111 deletions.
22 changes: 8 additions & 14 deletions lib/index.test.js
Expand Up @@ -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('.');
Expand All @@ -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();
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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 () => {
Expand Down Expand Up @@ -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 });
Expand All @@ -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'));
});
Expand Down
95 changes: 0 additions & 95 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions package.json
Expand Up @@ -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": {
Expand Down

0 comments on commit eea9101

Please sign in to comment.