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.

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

Jump to bottom

Fixed broken Profiler test #19894

Merged
merged 1 commit into from
Sep 23, 2020
+12 −15
Merged

Fixed broken Profiler test #19894

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 12 additions & 15 deletions packages/react/src/__tests__/ReactProfiler-test.internal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3477,16 +3477,16 @@ describe('Profiler', () => {
}
}

const onPostCommit = jest.fn(() => {
Scheduler.unstable_yieldValue('onPostCommit');
const onCommit = jest.fn(() => {
Scheduler.unstable_yieldValue('onCommit');
});
ReactNoop.act(async () => {
await ReactNoop.act(async () => {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is silly easy to do.

SchedulerTracing.unstable_trace(
interaction.name,
Scheduler.unstable_now(),
() => {
ReactNoop.render(
<React.Profiler id="test-profiler" onPostCommit={onPostCommit}>
<React.Profiler id="test-profiler" onCommit={onCommit}>
<React.Suspense fallback={<Text text="Loading..." />}>
<AsyncText text="Async" ms={20000} />
</React.Suspense>
Expand All @@ -3511,13 +3511,13 @@ describe('Profiler', () => {
'Text [Loading...]',
'Text [Sync]',
'Monkey',
'onPostCommit',
'onCommit',
]);
// Should have committed the placeholder.
expect(ReactNoop.getChildrenAsJSX()).toEqual('Loading...Sync');
expect(onPostCommit).toHaveBeenCalledTimes(1);
expect(onCommit).toHaveBeenCalledTimes(1);

let call = onPostCommit.mock.calls[0];
let call = onCommit.mock.calls[0];
expect(call[0]).toEqual('test-profiler');
expect(call[4]).toMatchInteractions(
ReactFeatureFlags.enableSchedulerTracing ? [interaction] : [],
Expand All @@ -3528,20 +3528,17 @@ describe('Profiler', () => {

// An unrelated update in the middle shouldn't affect things...
monkey.current.forceUpdate();
expect(Scheduler).toFlushAndYield(['Monkey', 'onPostCommit']);
expect(onPostCommit).toHaveBeenCalledTimes(2);
expect(Scheduler).toFlushAndYield(['Monkey', 'onCommit']);
expect(onCommit).toHaveBeenCalledTimes(2);

// Once the promise resolves, we render the suspended view
await awaitableAdvanceTimers(20000);
expect(Scheduler).toHaveYielded(['Promise resolved [Async]']);
expect(Scheduler).toFlushAndYield([
'AsyncText [Async]',
'onPostCommit',
]);
expect(Scheduler).toFlushAndYield(['AsyncText [Async]', 'onCommit']);
expect(ReactNoop.getChildrenAsJSX()).toEqual('AsyncSync');
expect(onPostCommit).toHaveBeenCalledTimes(3);
expect(onCommit).toHaveBeenCalledTimes(3);

call = onPostCommit.mock.calls[2];
call = onCommit.mock.calls[2];
expect(call[0]).toEqual('test-profiler');
expect(call[4]).toMatchInteractions(
ReactFeatureFlags.enableSchedulerTracing ? [interaction] : [],
Expand Down