-
Notifications
You must be signed in to change notification settings - Fork 3k
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
fix: dont run all nested beforeAll hooks on test start #17938
Open
francescov1
wants to merge
8
commits into
oven-sh:main
Choose a base branch
from
francescov1:dont-run-all-beforealls-at-once
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+84
−22
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
6314ab1
Run beforeAll if needed
francescov1 70c2572
Cleanup beforeall flag
francescov1 abb8b25
Add test
francescov1 b9c1b21
Remove redundant check, update tests
francescov1 a1cce4b
Fix tests
francescov1 5d10a78
Rename
francescov1 f2396aa
Simplify by using runBeforeCallbacks
francescov1 cf4f10a
Remove unused field
francescov1 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1132,15 +1132,6 @@ pub const DescribeScope = struct { | |
var i: TestRunner.Test.ID = 0; | ||
|
||
if (this.shouldEvaluateScope()) { | ||
if (this.runCallback(globalObject, .beforeAll)) |err| { | ||
_ = globalObject.bunVM().uncaughtException(globalObject, err, true); | ||
while (i < end) { | ||
Jest.runner.?.reportFailure(i + this.test_id_start, source.path.text, tests[i].label, 0, 0, this); | ||
i += 1; | ||
} | ||
this.deinit(globalObject); | ||
return; | ||
} | ||
if (end == 0) { | ||
var runner = allocator.create(TestRunnerTask) catch unreachable; | ||
runner.* = .{ | ||
|
@@ -1375,6 +1366,12 @@ pub const TestRunnerTask = struct { | |
jsc_vm.onUnhandledRejectionCtx = this; | ||
jsc_vm.onUnhandledRejection = onUnhandledRejection; | ||
|
||
if (this.describe.runCallback(globalThis, .beforeAll)) |err| { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Instead we can trigger the |
||
_ = jsc_vm.uncaughtException(globalThis, err, true); | ||
Jest.runner.?.reportFailure(test_id, this.source_file_path, test_.label, 0, 0, describe); | ||
return false; | ||
} | ||
|
||
if (this.needs_before_each) { | ||
this.needs_before_each = false; | ||
const label = test_.label; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the main culprit, it goes up the parent chain and calls all
beforeAll
blocks and its own before starting the test