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 ci #6356

Merged
merged 2 commits into from
May 30, 2018
+8 −8
Merged

Fix ci #6356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b5b12a
fix: re-add `skipSuiteOnJestCircus`
SimenB May 30, 2018
69e5925
fix: update snapshot after landing #6234
SimenB May 30, 2018
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
8 changes: 0 additions & 8 deletions packages/jest-circus/src/__tests__/__snapshots__/after_all-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ finish_describe_definition: describe
run_start
run_describe_start: ROOT_DESCRIBE_BLOCK
run_describe_start: describe
hook_start: beforeAll
hook_success: beforeAll
Copy link
Collaborator

Choose a reason for hiding this comment

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

These hooks shouldn't be removed, don't they?

The describe block doesn't have any skipped or focused tests:
https://github.com/facebook/jest/blob/644dd0d6335651794e2f34ec73e7c82c0bc050d2/packages/jest-circus/src/__tests__/after_all-test.js#L56-L66

Copy link
Collaborator

Choose a reason for hiding this comment

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

Oh, I missed the outer hooks hidden by the diff. All good!

Copy link
Contributor

Choose a reason for hiding this comment

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

we should definitely add some intentation to snapshots! :)

run_describe_start: child describe
test_start: my test
hook_start: beforeEach
Expand All @@ -25,8 +23,6 @@ hook_start: afterEach
hook_success: afterEach
test_done: my test
run_describe_finish: child describe
hook_start: afterAll
hook_success: afterAll
run_describe_finish: describe
run_describe_finish: ROOT_DESCRIBE_BLOCK
run_finish
Expand All @@ -45,10 +41,6 @@ finish_describe_definition: describe
run_start
run_describe_start: ROOT_DESCRIBE_BLOCK
run_describe_start: describe
hook_start: beforeAll
hook_success: beforeAll
hook_start: afterAll
hook_success: afterAll
run_describe_finish: describe
run_describe_finish: ROOT_DESCRIBE_BLOCK
run_finish
Expand Down
8 changes: 8 additions & 0 deletions scripts/ConditionalTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@ const ConditionalTest = {
}
},

skipSuiteOnJestCircus() {
if (this.isJestCircusRun()) {
fit('does not work on jest-circus', () => {
console.warn('[SKIP] Does not work on jest-circus');
});
}
},

skipSuiteOnWindows() {
if (process.platform === 'win32') {
fit('does not work on Windows', () => {
Expand Down