-
-
Notifications
You must be signed in to change notification settings - Fork 6.5k
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
Pass docblock pragmas to TestEnvironment constructor. #8320
Merged
scotthovestadt
merged 7 commits into
jestjs:master
from
scotthovestadt:test-env-docblock
Apr 13, 2019
Merged
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
d45fa8a
Pass docblock pragmas to test environment constructor.
scotthovestadt 88fdc85
Add test and documentation.
scotthovestadt 65c63f4
Update Configuration.md
scotthovestadt 6905321
Merge branch 'master' into test-env-docblock
scotthovestadt 0afaa33
Update CHANGELOG.md
scotthovestadt 3ce1c59
Update runTest.ts
scotthovestadt 740075b
Move docblock pragmas test into own files.
scotthovestadt 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
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
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
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
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
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 |
---|---|---|
|
@@ -14,17 +14,19 @@ import {JestFakeTimers as FakeTimers} from '@jest/fake-timers'; | |
type JestMockFn = typeof jestMock.fn; | ||
type JestMockSpyOn = typeof jestMock.spyOn; | ||
|
||
export type EnvironmentContext = { | ||
console?: Console; | ||
testPath?: Config.Path; | ||
}; | ||
// In Jest 25, remove `Partial` since it's incorrect. The properties are always | ||
// passed, or not. The context itself is optional, not properties within it. | ||
export type EnvironmentContext = Partial<{ | ||
console: Console; | ||
docblockPragmas: {[key: string]: string | Array<string>}; | ||
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. Is the docblock types exported from anywhere? Maybe not worth the dep 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. Yeah, I didn’t think it was worth the dependency. |
||
testPath: Config.Path; | ||
}>; | ||
|
||
// TODO: type this better: https://nodejs.org/api/modules.html#modules_the_module_wrapper | ||
type ModuleWrapper = (...args: Array<unknown>) => unknown; | ||
|
||
export declare class JestEnvironment { | ||
constructor(config: Config.ProjectConfig); | ||
constructor(config: Config.ProjectConfig, context: EnvironmentContext); | ||
constructor(config: Config.ProjectConfig, context?: EnvironmentContext); | ||
global: Global.Global; | ||
fakeTimers: FakeTimers<unknown> | null; | ||
moduleMocker: ModuleMocker | null; | ||
|
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.
Would prefer a distinct test file and Environment impl to separate concerns - this one tests ESM default export support and I wouldn't want
docblock pragmas
to fail as well if that breaksThere 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.
Done.