Skip to content

Clean up enableSyncDefaultUpdates flag a bit #26858

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Jun 1, 2023
Merged

Clean up enableSyncDefaultUpdates flag a bit #26858

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8786805
Clean up enableSyncDefaultUpdates flag a bit
rickhanlonii May 26, 2023
9f02826
Flip bool
rickhanlonii May 31, 2023
0e8dd54
Fix tests
rickhanlonii May 31, 2023
f708808
Fix tests
rickhanlonii May 31, 2023
aa86e10
Fix tests
rickhanlonii May 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix tests
  • Loading branch information
@rickhanlonii
rickhanlonii committed May 31, 2023
commit aa86e109c2a6d29b1d56f9914e53d3406bf949d9
29 changes: 14 additions & 15 deletions packages/react-reconciler/src/__tests__/ReactExpiration-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,21 +126,20 @@ describe('ReactExpiration', () => {

it('increases priority of updates as time progresses', async () => {
if (gate(flags => flags.forceConcurrentByDefaultForTesting)) {
// TODO: How does this pass on main?
// ReactNoop.render(<span prop="done" />);
// expect(ReactNoop).toMatchRenderedOutput(null);
//
// // Nothing has expired yet because time hasn't advanced.
// flushNextRenderIfExpired();
// expect(ReactNoop).toMatchRenderedOutput(null);
// // Advance time a bit, but not enough to expire the low pri update.
// ReactNoop.expire(4500);
// flushNextRenderIfExpired();
// expect(ReactNoop).toMatchRenderedOutput(null);
// // Advance by another second. Now the update should expire and flush.
// ReactNoop.expire(500);
// flushNextRenderIfExpired();
// expect(ReactNoop).toMatchRenderedOutput(<span prop="done" />);
ReactNoop.render(<span prop="done" />);
expect(ReactNoop).toMatchRenderedOutput(null);

// Nothing has expired yet because time hasn't advanced.
flushNextRenderIfExpired();
expect(ReactNoop).toMatchRenderedOutput(null);
// Advance time a bit, but not enough to expire the low pri update.
ReactNoop.expire(4500);
flushNextRenderIfExpired();
expect(ReactNoop).toMatchRenderedOutput(null);
// Advance by another second. Now the update should expire and flush.
ReactNoop.expire(500);
flushNextRenderIfExpired();
expect(ReactNoop).toMatchRenderedOutput(<span prop="done" />);
} else {
ReactNoop.render(<Text text="Step 1" />);
React.startTransition(() => {
Expand Down
2 changes: 1 addition & 1 deletion scripts/jest/setupTests.www.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jest.mock('shared/ReactFeatureFlags', () => {
const actual = jest.requireActual('shared/forks/ReactFeatureFlags.www');

// This flag is only used by tests, it should never be set elsewhere.
actual.forceConcurrentByDefaultForTesting = __VARIANT__;
actual.forceConcurrentByDefaultForTesting = !__VARIANT__;

return actual;
});
Expand Down