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

[act] remove obsolete container and warning #16312

Merged
merged 1 commit into from
Aug 9, 2019
Merged

[act] remove obsolete container and warning #16312

Show file tree
Hide file tree
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
28 changes: 1 addition & 27 deletions packages/react-dom/src/test-utils/ReactTestUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
import type {Thenable} from 'react-reconciler/src/ReactFiberWorkLoop';

import React from 'react';
import ReactDOM from 'react-dom';
Expand All @@ -19,7 +18,6 @@ import {
import SyntheticEvent from 'events/SyntheticEvent';
import invariant from 'shared/invariant';
import lowPriorityWarning from 'shared/lowPriorityWarning';
import warningWithoutStack from 'shared/warningWithoutStack';
import {ELEMENT_NODE} from '../shared/HTMLNodeType';
import * as DOMTopLevelEventTypes from '../events/DOMTopLevelEventTypes';
import {PLUGIN_EVENT_SYSTEM} from 'events/EventSystemFlags';
Expand Down Expand Up @@ -153,12 +151,6 @@ function validateClassInstance(inst, methodName) {
);
}

// a plain dom element, lazily initialized, used by act() when flushing effects
let actContainerElement = null;

// a warning for when you try to use TestUtils.act in a non-browser environment
let didWarnAboutActInNodejs = false;

/**
* Utilities for making it easy to test React components.
*
Expand Down Expand Up @@ -395,25 +387,7 @@ const ReactTestUtils = {
Simulate: null,
SimulateNative: {},

act(callback: () => Thenable) {
if (actContainerElement === null) {
if (__DEV__) {
// warn if we're trying to use this in something like node (without jsdom)
if (didWarnAboutActInNodejs === false) {
didWarnAboutActInNodejs = true;
warningWithoutStack(
typeof document !== 'undefined' && document !== null,
'It looks like you called ReactTestUtils.act(...) in a non-browser environment. ' +
"If you're using TestRenderer for your tests, you should call " +
'ReactTestRenderer.act(...) instead of ReactTestUtils.act(...).',
);
}
}
// now make the stub element
actContainerElement = document.createElement('div');
}
return act(callback);
},
act,
};

/**
Expand Down
16 changes: 0 additions & 16 deletions packages/react-test-renderer/src/__tests__/ReactTestRenderer-test.internal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1022,20 +1022,4 @@ describe('ReactTestRenderer', () => {
expect(Scheduler).toFlushWithoutYielding();
ReactTestRenderer.create(<App />);
});

// we run this test here because we need a dom-less scope
it('warns and throws if you use TestUtils.act instead of TestRenderer.act in node', () => {
// we warn when you try to load 2 renderers in the same 'scope'
// so as suggested, we call resetModules() to carry on with the test
jest.resetModules();
const {act} = require('react-dom/test-utils');
expect(() => {
expect(() => act(() => {})).toThrow('document is not defined');
}).toWarnDev(
[
'It looks like you called ReactTestUtils.act(...) in a non-browser environment',
],
{withoutStack: 1},
);
});
});