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.

Sign up for GitHub

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

fix: disallow hook definitions in tests #9957

Merged
merged 10 commits into from
May 4, 2020
Merged

fix: disallow hook definitions in tests #9957

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2983c35
fix: disallow hook defintions in tests
SimenB Apr 17, 2020
e8f74b7
Merge branch 'master' into disallow-hooks-in-tests
SimenB May 4, 2020
35c23ca
Merge branch 'master' into disallow-hooks-in-tests
SimenB May 4, 2020
7f38a26
push into unhandled
SimenB May 4, 2020
d612eab
update snap
SimenB May 4, 2020
2e6b642
push error into current test
SimenB May 4, 2020
b212f99
fix type of testErrors
SimenB May 4, 2020
861fbbf
another one
SimenB May 4, 2020
7be0514
remove extraneous type
SimenB May 4, 2020
011f593
update snap
SimenB May 4, 2020
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
Prev Previous commit
Next Next commit
push into unhandled
  • Loading branch information
@SimenB
SimenB committed May 4, 2020
commit 7f38a269a1fd18dd8bb111f52643228fe4ac595f
47 changes: 28 additions & 19 deletions packages/jest-circus/src/eventHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,12 @@ const eventHandler: Circus.EventHandler = (
const {currentDescribeBlock, currentlyRunningTest} = state;

if (currentlyRunningTest) {
throw new Error(
`Cannot nest a describe inside a test. Describe block "${blockName}" cannot run because it is nested within "${currentlyRunningTest.name}".`,
state.unhandledErrors.push(
new Error(
`Cannot nest a describe inside a test. Describe block "${blockName}" cannot run because it is nested within "${currentlyRunningTest.name}".`,
),
);
break;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pushing into the errors array is essentially what happened before, except we don't go through the handler again into the error case

}

const describeBlock = makeDescribe(blockName, currentDescribeBlock, mode);
Expand Down Expand Up @@ -94,19 +97,21 @@ const eventHandler: Circus.EventHandler = (
const {asyncError, fn, hookType: type, timeout} = event;

if (currentlyRunningTest) {
throw new Error(
`Hooks cannot be defined inside tests. Hook of type "${type}" is nested within "${currentlyRunningTest.name}".`,
state.unhandledErrors.push(
new Error(
`Hooks cannot be defined inside tests. Hook of type "${type}" is nested within "${currentlyRunningTest.name}".`,
),
);
break;
} else if (hasStarted) {
state.unhandledErrors.push(
new Error(
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no need to mutate the message in asyncError, this is sync code

'Cannot add a hook after tests have started running. Hooks must be defined synchronously.',
),
);
}

const parent = currentDescribeBlock;

if (hasStarted) {
asyncError.message =
'Cannot add a hook after tests have started running. Hooks must be defined synchronously.';
state.unhandledErrors.push(asyncError);
break;
}
const parent = currentDescribeBlock;

currentDescribeBlock.hooks.push({asyncError, fn, parent, timeout, type});
break;
Expand All @@ -116,14 +121,18 @@ const eventHandler: Circus.EventHandler = (
const {asyncError, fn, mode, testName: name, timeout} = event;

if (currentlyRunningTest) {
throw new Error(
`Tests cannot be nested. Test "${name}" cannot run because it is nested within "${currentlyRunningTest.name}".`,
state.unhandledErrors.push(
new Error(
`Tests cannot be nested. Test "${name}" cannot run because it is nested within "${currentlyRunningTest.name}".`,
),
);
break;
} else if (hasStarted) {
state.unhandledErrors.push(
new Error(
'Cannot add a test after tests have started running. Tests must be defined synchronously.',
),
);
}
if (hasStarted) {
asyncError.message =
'Cannot add a test after tests have started running. Tests must be defined synchronously.';
state.unhandledErrors.push(asyncError);
break;
}

Expand Down