Update to Jest 12.1.1 and Jasmine 2#6872
Merged
gaearon merged 6 commits intofacebook:masterfrom May 25, 2016
gaearon:jest-cli@12
Merged
Update to Jest 12.1.1 and Jasmine 2#6872gaearon merged 6 commits intofacebook:masterfrom gaearon:jest-cli@12
gaearon merged 6 commits intofacebook:masterfrom
gaearon:jest-cli@12
Conversation
ghost
added
|
@gaearon updated the pull request. |
Member
|
Cool, thanks for taking this on and tracking down. If it rebases cleanly onto master, let's do that and then squash those last 2 commits into the "update jasmine2 with changes from master" commit, then do a real merge (not squash and merge). |
|
@gaearon updated the pull request. |
gaearon
changed the title
|
@gaearon updated the pull request. |
Closed
Collaborator
Author
|
|
zpao
pushed a commit
to zpao/react
that referenced
this pull request
Jun 8, 2016
Update to Jest 12.1.1 and Jasmine 2 (cherry picked from commit c0ecde6)
zpao
pushed a commit
that referenced
this pull request
Jun 14, 2016
Update to Jest 12.1.1 and Jasmine 2 (cherry picked from commit c0ecde6)
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
I took #6769 as a base and updated it to match changes in master so that it merges cleanly.