Skip to content
This repository has been archived by the owner on Apr 13, 2023. It is now read-only.

Update React and Combine Tests #351

Merged
merged 5 commits into from
Dec 3, 2016
Merged

Update React and Combine Tests #351

merged 5 commits into from
Dec 3, 2016

Conversation

johnthepink
Copy link
Contributor

This updates react to 15.4.1, and react-native to 0.38.0. React 15.4 fixed the injectEnvironment issue mentioned here, which prevented our tests from using enzyme and react-test-renderer in the same file.

@johnthepink johnthepink changed the title Update React and Combine Tests [WIP] Update React and Combine Tests Dec 2, 2016
@johnthepink johnthepink force-pushed the test-updates branch 2 times, most recently from d08e678 to 27eda36 Compare December 2, 2016 04:01
@johnthepink
Copy link
Contributor Author

Ran in to an interesting issue, any suggestions more than welcome.

Upgrading React introduced an issue on the CI with importing "React" vs "react". See this comment.

Using the jest preset included in react-native actually fixed this issue, but caused tests to fail that were making actual network requests (see server swapi test).

For now, I have downgraded to react 15.4.0. Moving forward, we should see if we can fix the network request tests, as the react-native jest preset included in react-native cleans up a lot of test logs.

@johnthepink johnthepink changed the title [WIP] Update React and Combine Tests Update React and Combine Tests Dec 2, 2016
@stubailo
Copy link
Contributor

stubailo commented Dec 2, 2016

Looks great! Perhaps let's open an issue for the other thing and merge this PR?

@jbaxleyiii
Copy link
Contributor

@johnthepink thanks so much for doing this! It may be worth setting up greenkeeper for this repo. @stubailo is that something someone at MDG could do?

@jbaxleyiii jbaxleyiii merged commit 13417df into master Dec 3, 2016
@jbaxleyiii jbaxleyiii deleted the test-updates branch December 3, 2016 02:34
@zol zol removed the in progress label Dec 3, 2016
@johnthepink
Copy link
Contributor Author

@jbaxleyiii @stubailo creating an issue now.

This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants