Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: fail tests when multiple done() calls are made #10624

Merged
merged 22 commits into from
Dec 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

### Features

- `[jest-circus]` [**BREAKING**] Fail tests when multiple `done()` calls are made ([#10624](https://github.com/facebook/jest/pull/10624))
- `[jest-circus, jest-jasmine2]` [**BREAKING**] Fail the test instead of just warning when describe returns a value ([#10947](https://github.com/facebook/jest/pull/10947))
- `[jest-config]` [**BREAKING**] Default to Node testing environment instead of browser (JSDOM) ([#9874](https://github.com/facebook/jest/pull/9874))
- `[jest-config]` [**BREAKING**] Use `jest-circus` as default test runner ([#10686](https://github.com/facebook/jest/pull/10686))
Expand Down
89 changes: 89 additions & 0 deletions e2e/__tests__/__snapshots__/callDoneTwice.test.ts.snap
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`\`done()\` should not be called more than once 1`] = `
FAIL __tests__/index.test.js
● \`done()\` called more than once › should fail

Expected done to be called once, but it was called multiple times.

8 | it('should fail', done => {
9 | done();
> 10 | done();
| ^
11 | });
12 |
13 | it('should fail inside a promise', done => {

at Object.done (__tests__/index.test.js:10:5)

● \`done()\` called more than once › should fail inside a promise

Expected done to be called once, but it was called multiple times.

15 | .then(() => {
16 | done();
> 17 | done();
| ^
18 | })
19 | .catch(err => err);
20 | });

at done (__tests__/index.test.js:17:9)

● multiple \`done()\` inside beforeEach › should fail

Expected done to be called once, but it was called multiple times.

24 | beforeEach(done => {
25 | done();
> 26 | done();
| ^
27 | });
28 |
29 | it('should fail', () => {

at Object.done (__tests__/index.test.js:26:5)

● multiple \`done()\` inside afterEach › should fail

Expected done to be called once, but it was called multiple times.

35 | afterEach(done => {
36 | done();
> 37 | done();
| ^
38 | });
39 |
40 | it('should fail', () => {

at Object.done (__tests__/index.test.js:37:5)

● multiple \`done()\` inside beforeAll › should fail

Expected done to be called once, but it was called multiple times.

46 | beforeAll(done => {
47 | done();
> 48 | done();
| ^
49 | });
50 |
51 | it('should fail', () => {

at done (__tests__/index.test.js:48:5)


● Test suite failed to run

Expected done to be called once, but it was called multiple times.

57 | afterAll(done => {
58 | done();
> 59 | done();
| ^
60 | });
61 |
62 | it('should fail', () => {

at done (__tests__/index.test.js:59:5)
`;
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ FAIL __tests__/asyncDefinition.test.js
14 | });
15 | });

at eventHandler (../../packages/jest-circus/build/eventHandler.js:144:11)
at eventHandler (../../packages/jest-circus/build/eventHandler.js:146:11)
at test (__tests__/asyncDefinition.test.js:12:5)

● Test suite failed to run
Expand All @@ -31,7 +31,7 @@ FAIL __tests__/asyncDefinition.test.js
15 | });
16 |

at eventHandler (../../packages/jest-circus/build/eventHandler.js:113:11)
at eventHandler (../../packages/jest-circus/build/eventHandler.js:114:11)
at afterAll (__tests__/asyncDefinition.test.js:13:5)

● Test suite failed to run
Expand All @@ -46,7 +46,7 @@ FAIL __tests__/asyncDefinition.test.js
20 | });
21 |

at eventHandler (../../packages/jest-circus/build/eventHandler.js:144:11)
at eventHandler (../../packages/jest-circus/build/eventHandler.js:146:11)
at test (__tests__/asyncDefinition.test.js:18:3)

● Test suite failed to run
Expand All @@ -60,6 +60,6 @@ FAIL __tests__/asyncDefinition.test.js
20 | });
21 |

at eventHandler (../../packages/jest-circus/build/eventHandler.js:113:11)
at eventHandler (../../packages/jest-circus/build/eventHandler.js:114:11)
at afterAll (__tests__/asyncDefinition.test.js:19:3)
`;
18 changes: 18 additions & 0 deletions e2e/__tests__/callDoneTwice.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/**
* Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
import wrap from 'jest-snapshot-serializer-raw';
import {skipSuiteOnJasmine} from '@jest/test-utils';
import {extractSummary} from '../Utils';
import runJest from '../runJest';

skipSuiteOnJasmine();
test('`done()` should not be called more than once', () => {
const {exitCode, stderr} = runJest('call-done-twice');
const {rest} = extractSummary(stderr);
expect(wrap(rest)).toMatchSnapshot();
expect(exitCode).toBe(1);
});
15 changes: 15 additions & 0 deletions e2e/__tests__/doneInHooks.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/**
* Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

import {skipSuiteOnJasmine} from '@jest/test-utils';
import runJest from '../runJest';

skipSuiteOnJasmine();
test('`done()` works properly in hooks', () => {
const {exitCode} = runJest('done-in-hooks');
expect(exitCode).toEqual(0);
});
65 changes: 65 additions & 0 deletions e2e/call-done-twice/__tests__/index.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
/**
* Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
describe('`done()` called more than once', () => {
flozender marked this conversation as resolved.
Show resolved Hide resolved
it('should fail', done => {
done();
done();
});

it('should fail inside a promise', done => {
Promise.resolve()
.then(() => {
done();
done();
})
.catch(err => err);
});
flozender marked this conversation as resolved.
Show resolved Hide resolved
});

describe('multiple `done()` inside beforeEach', () => {
beforeEach(done => {
flozender marked this conversation as resolved.
Show resolved Hide resolved
done();
done();
});

it('should fail', () => {
expect('foo').toMatch('foo');
});
});

describe('multiple `done()` inside afterEach', () => {
afterEach(done => {
done();
done();
});

it('should fail', () => {
expect('foo').toMatch('foo');
});
});

describe('multiple `done()` inside beforeAll', () => {
beforeAll(done => {
done();
done();
});

it('should fail', () => {
expect('foo').toMatch('foo');
});
});

describe('multiple `done()` inside afterAll', () => {
afterAll(done => {
done();
done();
});

it('should fail', () => {
expect('foo').toMatch('foo');
});
});
5 changes: 5 additions & 0 deletions e2e/call-done-twice/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"jest": {
"testEnvironment": "node"
}
}
16 changes: 16 additions & 0 deletions e2e/done-in-hooks/__tests__/index.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/**
* Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
*/
describe('`done()` should work with hooks', done => {
beforeEach(done => done());
it('foo', () => {
expect('foo').toMatch('foo');
});
it('bar', () => {
expect('bar').toMatch('bar');
});
});
5 changes: 5 additions & 0 deletions e2e/done-in-hooks/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"jest": {
"testEnvironment": "node"
}
}
14 changes: 13 additions & 1 deletion packages/jest-circus/src/eventHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const eventHandler: Circus.EventHandler = (
break;
}
case 'hook_start': {
event.hook.seenDone = false;
break;
}
case 'start_describe_definition': {
Expand Down Expand Up @@ -113,7 +114,14 @@ const eventHandler: Circus.EventHandler = (
}
const parent = currentDescribeBlock;

currentDescribeBlock.hooks.push({asyncError, fn, parent, timeout, type});
currentDescribeBlock.hooks.push({
asyncError,
fn,
parent,
seenDone: false,
flozender marked this conversation as resolved.
Show resolved Hide resolved
timeout,
type,
});
break;
}
case 'add_test': {
Expand Down Expand Up @@ -188,6 +196,10 @@ const eventHandler: Circus.EventHandler = (
event.test.invocations += 1;
break;
}
case 'test_fn_start': {
SimenB marked this conversation as resolved.
Show resolved Hide resolved
event.test.seenDone = false;
break;
}
case 'test_fn_failure': {
const {
error,
Expand Down
22 changes: 19 additions & 3 deletions packages/jest-circus/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ export const makeTest = (
mode,
name: convertDescriptorToString(name),
parent,
seenDone: false,
startedAt: null,
status: null,
timeout,
Expand Down Expand Up @@ -189,9 +190,25 @@ export const callAsyncCircusFn = (
// soon as `done` called.
if (takesDoneCallback(fn)) {
let returnedValue: unknown = undefined;

const done = (reason?: Error | string): void => {
// We need to keep a stack here before the promise tick
const errorAtDone = new ErrorWithStack(undefined, done);

if (!completed && testOrHook.seenDone) {
errorAtDone.message =
'Expected done to be called once, but it was called multiple times.';

if (reason) {
errorAtDone.message +=
' Reason: ' + prettyFormat(reason, {maxDepth: 3});
}
reject(errorAtDone);
throw errorAtDone;
} else {
testOrHook.seenDone = true;
}

// Use `Promise.resolve` to allow the event loop to go a single tick in case `done` is called synchronously
Promise.resolve().then(() => {
if (returnedValue !== undefined) {
Expand All @@ -203,7 +220,6 @@ export const callAsyncCircusFn = (
}

let errorAsErrorObject: Error;

if (checkIsError(reason)) {
errorAsErrorObject = reason;
} else {
Expand Down Expand Up @@ -274,12 +290,12 @@ export const callAsyncCircusFn = (
completed = true;
// If timeout is not cleared/unrefed the node process won't exit until
// it's resolved.
timeoutID.unref && timeoutID.unref();
timeoutID.unref?.();
clearTimeout(timeoutID);
})
.catch(error => {
completed = true;
timeoutID.unref && timeoutID.unref();
timeoutID.unref?.();
clearTimeout(timeoutID);
throw error;
});
Expand Down
Loading