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.

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

[test] Update react next patch #21746

Merged
merged 3 commits into from
Jul 17, 2020
Merged

Conversation

eps1lon
Copy link
Member

@eps1lon eps1lon commented Jul 10, 2020

Does not fix test failures yet. Will look into that later.

Forward ports react-next.diff which requires @testing-library/react@^10.4.7 (specifically testing-library/react-testing-library#746).

How to:

  • checkout commit when the diff was last updated
  • create new branch git checkout -b test/update-react-next-patch
  • apply patch git apply scripts/react-next.diff
  • commit changes
  • rebase on the branch you want to target e.g. next: git rebase next
  • fix merge conflicts
  • create new patch that includes resolved merge conflicts: git diff HEAD^! > rext-next.new.diff
  • override scripts/react-next.diff with rext-next.new.diff

This only explains how to forward port. For fixing tests on react@next use REACT_DIST_TAG=next node scripts/use-react-dist-tag.js and start fixing failures.

@eps1lon eps1lon added the test label Jul 10, 2020
diff --git a/packages/material-ui/src/Unstable_TrapFocus/Unstable_TrapFocus.js b/packages/material-ui/src/Unstable_TrapFocus/Unstable_TrapFocus.js
index 97fac726d..e43c9f5d4 100644
--- a/packages/material-ui/src/Unstable_TrapFocus/Unstable_TrapFocus.js
+++ b/packages/material-ui/src/Unstable_TrapFocus/Unstable_TrapFocus.js
Copy link
Member Author

Choose a reason for hiding this comment

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

Can't come up with a reliable isolated test for this change so this stays strictly in this patch for now. There's definitely an issue with testing-library (we probably need to use a fork of cleanup because the new one is not explained and targetted at jest) and likely an issue with JSDOM.

Copy link
Member Author

Choose a reason for hiding this comment

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

Also very likely that there's an issue on our end. In the end we're reaching into a lot of internals.

@mui-pr-bot
Copy link

mui-pr-bot commented Jul 10, 2020

No bundle size changes comparing 44f00aa...83ab6f6

Generated by 🚫 dangerJS against 83ab6f6

@eps1lon eps1lon force-pushed the test/update-react-next-patch branch from c6f0963 to 811d5ae Compare July 15, 2020 14:21
@github-actions github-actions bot added the PR: out-of-date The pull request has merge conflicts and can't be merged label Jul 16, 2020
@eps1lon eps1lon force-pushed the test/update-react-next-patch branch from 811d5ae to dcbf778 Compare July 16, 2020 10:26
@eps1lon eps1lon removed the PR: out-of-date The pull request has merge conflicts and can't be merged label Jul 16, 2020
@eps1lon eps1lon force-pushed the test/update-react-next-patch branch from a77f146 to 12280e6 Compare July 16, 2020 10:49
@eps1lon eps1lon force-pushed the test/update-react-next-patch branch from 12280e6 to 83ab6f6 Compare July 17, 2020 08:37
@eps1lon eps1lon merged commit 8d0d937 into mui:next Jul 17, 2020
@eps1lon eps1lon deleted the test/update-react-next-patch branch July 17, 2020 09:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants