Skip to content

Commit

Permalink
Revert "Support use in act testing API (#25523)"
Browse files Browse the repository at this point in the history 
This reverts commit c635807.
  • Loading branch information
@poteto
poteto committed Oct 21, 2022
1 parent dd102e8 commit 502635b
Show file tree
Hide file tree
Showing 5 changed files with 118 additions and 380 deletions.
7 changes: 0 additions & 7 deletions packages/react-reconciler/src/ReactFiberWakeable.new.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ import type {
RejectedThenable,
} from 'shared/ReactTypes';

import ReactSharedInternals from 'shared/ReactSharedInternals';
const {ReactCurrentActQueue} = ReactSharedInternals;

let suspendedThenable: Thenable<mixed> | null = null;
let adHocSuspendCount: number = 0;

Expand Down Expand Up @@ -127,10 +124,6 @@ export function trackUsedThenable<T>(thenable: Thenable<T>, index: number) {
}
usedThenables[index] = thenable;
lastUsedThenable = thenable;

if (__DEV__ && ReactCurrentActQueue.current !== null) {
ReactCurrentActQueue.didUsePromise = true;
}
}

export function getPreviouslyUsedThenableAtIndex<T>(
Expand Down
7 changes: 0 additions & 7 deletions packages/react-reconciler/src/ReactFiberWakeable.old.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ import type {
RejectedThenable,
} from 'shared/ReactTypes';

import ReactSharedInternals from 'shared/ReactSharedInternals';
const {ReactCurrentActQueue} = ReactSharedInternals;

let suspendedThenable: Thenable<mixed> | null = null;
let adHocSuspendCount: number = 0;

Expand Down Expand Up @@ -127,10 +124,6 @@ export function trackUsedThenable<T>(thenable: Thenable<T>, index: number) {
}
usedThenables[index] = thenable;
lastUsedThenable = thenable;

if (__DEV__ && ReactCurrentActQueue.current !== null) {
ReactCurrentActQueue.didUsePromise = true;
}
}

export function getPreviouslyUsedThenableAtIndex<T>(
Expand Down
157 changes: 0 additions & 157 deletions packages/react-reconciler/src/__tests__/ReactIsomorphicAct-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,15 @@
let React;
let ReactNoop;
let act;
let use;
let Suspense;
let DiscreteEventPriority;
let startTransition;

describe('isomorphic act()', () => {
beforeEach(() => {
React = require('react');

ReactNoop = require('react-noop-renderer');
DiscreteEventPriority = require('react-reconciler/constants')
.DiscreteEventPriority;
act = React.unstable_act;
use = React.experimental_use;
Suspense = React.Suspense;
startTransition = React.startTransition;
});

beforeEach(() => {
Expand Down Expand Up @@ -140,154 +133,4 @@ describe('isomorphic act()', () => {
expect(root).toMatchRenderedOutput('C');
});
});

// @gate __DEV__
// @gate enableUseHook
test('unwraps promises by yielding to microtasks (async act scope)', async () => {
const promise = Promise.resolve('Async');

function Fallback() {
throw new Error('Fallback should never be rendered');
}

function App() {
return use(promise);
}

const root = ReactNoop.createRoot();
await act(async () => {
startTransition(() => {
root.render(
<Suspense fallback={<Fallback />}>
<App />
</Suspense>,
);
});
});
expect(root).toMatchRenderedOutput('Async');
});

// @gate __DEV__
// @gate enableUseHook
test('unwraps promises by yielding to microtasks (non-async act scope)', async () => {
const promise = Promise.resolve('Async');

function Fallback() {
throw new Error('Fallback should never be rendered');
}

function App() {
return use(promise);
}

const root = ReactNoop.createRoot();

// Note that the scope function is not an async function
await act(() => {
startTransition(() => {
root.render(
<Suspense fallback={<Fallback />}>
<App />
</Suspense>,
);
});
});
expect(root).toMatchRenderedOutput('Async');
});

// @gate __DEV__
// @gate enableUseHook
test('warns if a promise is used in a non-awaited `act` scope', async () => {
const promise = new Promise(() => {});

function Fallback() {
throw new Error('Fallback should never be rendered');
}

function App() {
return use(promise);
}

spyOnDev(console, 'error');
const root = ReactNoop.createRoot();
act(() => {
startTransition(() => {
root.render(
<Suspense fallback={<Fallback />}>
<App />
</Suspense>,
);
});
});

// `act` warns after a few microtasks, instead of a macrotask, so that it's
// more likely to be attributed to the correct test case.
//
// The exact number of microtasks is an implementation detail; just needs
// to happen when the microtask queue is flushed.
await null;
await null;
await null;

expect(console.error.calls.count()).toBe(1);
expect(console.error.calls.argsFor(0)[0]).toContain(
'Warning: A component suspended inside an `act` scope, but the `act` ' +
'call was not awaited. When testing React components that ' +
'depend on asynchronous data, you must await the result:\n\n' +
'await act(() => ...)',
);
});

// @gate __DEV__
test('does not warn when suspending via legacy `throw` API in non-awaited `act` scope', async () => {
let didResolve = false;
let resolvePromise;
const promise = new Promise(r => {
resolvePromise = () => {
didResolve = true;
r();
};
});

function Fallback() {
return 'Loading...';
}

function App() {
if (!didResolve) {
throw promise;
}
return 'Async';
}

spyOnDev(console, 'error');
const root = ReactNoop.createRoot();
act(() => {
startTransition(() => {
root.render(
<Suspense fallback={<Fallback />}>
<App />
</Suspense>,
);
});
});
expect(root).toMatchRenderedOutput('Loading...');

// `act` warns after a few microtasks, instead of a macrotask, so that it's
// more likely to be attributed to the correct test case.
//
// The exact number of microtasks is an implementation detail; just needs
// to happen when the microtask queue is flushed.
await null;
await null;
await null;

expect(console.error.calls.count()).toBe(0);

// Finish loading the data
await act(async () => {
resolvePromise();
});
expect(root).toMatchRenderedOutput('Async');
});
});
Loading

0 comments on commit 502635b

Please sign in to comment.