-
Notifications
You must be signed in to change notification settings - Fork 46.8k
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
Update to Jest 18 #8621
Merged
Merged
Update to Jest 18 #8621
Conversation
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
bvaughn
approved these changes
Dec 22, 2016
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.
Looks good to me! Tests pass locally on this branch with a fresh yarn install
.
I did notice that after yarn install
my yarn.lock
had been modified like so:
diff --git a/yarn.lock b/yarn.lock
index 4d7e8bd..fa34977 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -486,7 +486,7 @@ babel-helpers@^6.16.0:
babel-runtime "^6.0.0"
babel-template "^6.16.0"
-babel-jest@^18.0.0:
+babel-jest@18.0.0, babel-jest@^18.0.0:
version "18.0.0"
resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-18.0.0.tgz#17ebba8cb3285c906d859e8707e4e79795fb65e3"
dependencies:
@@ -3127,7 +3127,7 @@ jest-changed-files@^17.0.2:
version "17.0.2"
resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-17.0.2.tgz#f5657758736996f590a51b87e5c9369d904ba7b7"
-jest-cli@^18.0.0:
+jest-cli@18.0.0:
version "18.0.0"
resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-18.0.0.tgz#11d141f5e9158d4f02c5c303815b5280f6887c55"
dependencies:
Oops, thanks for spotting that. |
jackjocross
pushed a commit
to jackjocross/react
that referenced
this pull request
Jan 13, 2017
gaearon
pushed a commit
that referenced
this pull request
Jan 23, 2017
* devDependencies: add core-js and es6-symbol polyfill for tests * Update Flow and fix issues (#8006) * Add npm v4.0.0 support (#8082) * Add support for node v7 (#8135) * Upgrade ESLint and dependencies, fix new lint errors, switch Travis to Yarn (#8309) * Update ESLint to 3.10.2 Also pull in fbjs for extending properly, per @zpao. This also disables consistent-return, which has about 80 failing cases in React currently. If we'd like to turn this back on, we should do it separately and fix all the call sites properly (rather than just adding 'return undefined;' everywhere, which adds no value. Fixes to all existing lint errors plus an update for yarn.lock to follow. * Update yarn.lock after the eslint update. * Fix all new eslint failures Unfortunately I had to add three eslint-disable-next-line instances. All have explanations inline. * Switch Travis to use yarn instead of npm * Update all Jest packages to 17.x (#8327) * Update all Jest packages to 17.x, cache babel-jest transforms * Remove the caching Looking at the other builds it doesn't seem to actually be that necessary. The bottleneck is executors, not build time. * Remove unnecessary package, fix fiber test runner * Regenerate yarn lockfile * Update Flow to 0.37.0 (#8608) Nothing really changes. * Update to Jest 18 (#8621) * mockImpl -> mockImplementation D4329549 * Fixed linting errors * circle.yml and circleci scripts * Update Flow and fix issues (#8006) * Fixed flow errors * Updated shrinkwrap * Removed unnecessary change * Added jest --runInBand flag * Removed ReactDOMFiber changes
gaearon
pushed a commit
that referenced
this pull request
Jan 23, 2017
* devDependencies: add core-js and es6-symbol polyfill for tests * Update Flow and fix issues (#8006) * Add npm v4.0.0 support (#8082) * Add support for node v7 (#8135) * Upgrade ESLint and dependencies, fix new lint errors, switch Travis to Yarn (#8309) * Update ESLint to 3.10.2 Also pull in fbjs for extending properly, per @zpao. This also disables consistent-return, which has about 80 failing cases in React currently. If we'd like to turn this back on, we should do it separately and fix all the call sites properly (rather than just adding 'return undefined;' everywhere, which adds no value. Fixes to all existing lint errors plus an update for yarn.lock to follow. * Update yarn.lock after the eslint update. * Fix all new eslint failures Unfortunately I had to add three eslint-disable-next-line instances. All have explanations inline. * Switch Travis to use yarn instead of npm * Update all Jest packages to 17.x (#8327) * Update all Jest packages to 17.x, cache babel-jest transforms * Remove the caching Looking at the other builds it doesn't seem to actually be that necessary. The bottleneck is executors, not build time. * Remove unnecessary package, fix fiber test runner * Regenerate yarn lockfile * Update Flow to 0.37.0 (#8608) Nothing really changes. * Update to Jest 18 (#8621) * mockImpl -> mockImplementation D4329549 * Fixed linting errors * circle.yml and circleci scripts * Update Flow and fix issues (#8006) * Fixed flow errors * Updated shrinkwrap * Removed unnecessary change * Added jest --runInBand flag * Removed ReactDOMFiber changes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Best feature: scrollback is finally properly cleared in watch mode.