diff --git a/src/isomorphic/children/__tests__/ReactChildren-test.js b/src/isomorphic/children/__tests__/ReactChildren-test.js index 33af1522c378..9d97007cd17c 100644 --- a/src/isomorphic/children/__tests__/ReactChildren-test.js +++ b/src/isomorphic/children/__tests__/ReactChildren-test.js @@ -25,7 +25,7 @@ describe('ReactChildren', () => { beforeEach(() => { jest.resetModules(); React = require('react'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); }); it('should support identity for simple', () => { diff --git a/src/isomorphic/children/__tests__/onlyChild-test.js b/src/isomorphic/children/__tests__/onlyChild-test.js index 082c389e6b53..f809f1b4efb3 100644 --- a/src/isomorphic/children/__tests__/onlyChild-test.js +++ b/src/isomorphic/children/__tests__/onlyChild-test.js @@ -13,17 +13,15 @@ describe('onlyChild', () => { var React; - var onlyChild; var WrapComponent; beforeEach(() => { React = require('react'); - onlyChild = require('onlyChild'); WrapComponent = class extends React.Component { render() { return (
- {onlyChild(this.props.children, this.props.mapFn, this)} + {React.Children.only(this.props.children, this.props.mapFn, this)}
); } @@ -38,7 +36,7 @@ describe('onlyChild', () => { ); - onlyChild(instance.props.children); + React.Children.only(instance.props.children); }).toThrow(); }); @@ -49,7 +47,7 @@ describe('onlyChild', () => { {null} ); - onlyChild(instance.props.children); + React.Children.only(instance.props.children); }).toThrow(); expect(function() { @@ -58,7 +56,7 @@ describe('onlyChild', () => { {undefined} ); - onlyChild(instance.props.children); + React.Children.only(instance.props.children); }).toThrow(); }); @@ -69,7 +67,7 @@ describe('onlyChild', () => { {[]} ); - onlyChild(instance.props.children); + React.Children.only(instance.props.children); }).toThrow(); }); @@ -80,7 +78,7 @@ describe('onlyChild', () => { {} ); - onlyChild(instance.props.children); + React.Children.only(instance.props.children); }).not.toThrow(); }); @@ -90,6 +88,6 @@ describe('onlyChild', () => { ); - expect(onlyChild(instance.props.children)).toEqual(); + expect(React.Children.only(instance.props.children)).toEqual(); }); }); diff --git a/src/isomorphic/classic/__tests__/ReactContextValidator-test.js b/src/isomorphic/classic/__tests__/ReactContextValidator-test.js index 000b3f7c6120..dbb91c9461f3 100644 --- a/src/isomorphic/classic/__tests__/ReactContextValidator-test.js +++ b/src/isomorphic/classic/__tests__/ReactContextValidator-test.js @@ -33,7 +33,7 @@ describe('ReactContextValidator', () => { PropTypes = require('prop-types'); React = require('react'); ReactDOM = require('react-dom'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); }); // TODO: This behavior creates a runtime dependency on propTypes. We should diff --git a/src/isomorphic/classic/__tests__/createReactClassIntegration-test.js b/src/isomorphic/classic/__tests__/createReactClassIntegration-test.js index c1b3f5db8df9..58d7ab0c7f9b 100644 --- a/src/isomorphic/classic/__tests__/createReactClassIntegration-test.js +++ b/src/isomorphic/classic/__tests__/createReactClassIntegration-test.js @@ -22,7 +22,7 @@ describe('create-react-class-integration', () => { PropTypes = require('prop-types'); React = require('react'); ReactDOM = require('react-dom'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); createReactClass = require('create-react-class/factory')( React.Component, React.isValidElement, diff --git a/src/isomorphic/classic/element/__tests__/ReactElement-test.js b/src/isomorphic/classic/element/__tests__/ReactElement-test.js index 3d6f7b9efc3e..1abcfb31a01a 100644 --- a/src/isomorphic/classic/element/__tests__/ReactElement-test.js +++ b/src/isomorphic/classic/element/__tests__/ReactElement-test.js @@ -30,7 +30,7 @@ describe('ReactElement', () => { React = require('react'); ReactDOM = require('react-dom'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); ReactDOMFeatureFlags = require('ReactDOMFeatureFlags'); // NOTE: We're explicitly not using JSX here. This is intended to test // classic JS without JSX. diff --git a/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js b/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js index 365b187d2439..53fbe6a1a3d7 100644 --- a/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js +++ b/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js @@ -23,7 +23,7 @@ describe('ReactElementClone', () => { PropTypes = require('prop-types'); React = require('react'); ReactDOM = require('react-dom'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); // NOTE: We're explicitly not using JSX here. This is intended to test // classic JS without JSX. diff --git a/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js b/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js index 969b4de9b6fb..99a6841cd711 100644 --- a/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js +++ b/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js @@ -32,7 +32,7 @@ describe('ReactElementValidator', () => { PropTypes = require('prop-types'); React = require('react'); ReactDOM = require('react-dom'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); ComponentClass = class extends React.Component { render() { return React.createElement('div'); diff --git a/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js b/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js index d4ea915bba43..c3b69005cfb4 100644 --- a/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js +++ b/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js @@ -23,7 +23,7 @@ describe('ReactJSXElement', () => { React = require('react'); ReactDOM = require('react-dom'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); Component = class extends React.Component { render() { return
; diff --git a/src/isomorphic/modern/element/__tests__/ReactJSXElementValidator-test.js b/src/isomorphic/modern/element/__tests__/ReactJSXElementValidator-test.js index ff1ff2e7c8e6..69541571dd99 100644 --- a/src/isomorphic/modern/element/__tests__/ReactJSXElementValidator-test.js +++ b/src/isomorphic/modern/element/__tests__/ReactJSXElementValidator-test.js @@ -33,7 +33,7 @@ describe('ReactJSXElementValidator', () => { PropTypes = require('prop-types'); React = require('react'); ReactDOM = require('react-dom'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); Component = class extends React.Component { render() { diff --git a/src/node_modules/react-art/index.js b/src/node_modules/react-art/index.js new file mode 100644 index 000000000000..0904d9c42013 --- /dev/null +++ b/src/node_modules/react-art/index.js @@ -0,0 +1,9 @@ +/** + * Copyright 2016-present Facebook. All Rights Reserved. + * + * @flow + */ + +'use strict'; + +module.exports = require('ReactARTFiber'); diff --git a/src/node_modules/react-dom/test-utils.js b/src/node_modules/react-dom/test-utils.js new file mode 100644 index 000000000000..ef0d67875e4e --- /dev/null +++ b/src/node_modules/react-dom/test-utils.js @@ -0,0 +1,9 @@ +/** + * Copyright 2016-present Facebook. All Rights Reserved. + * + * @flow + */ + +'use strict'; + +module.exports = require('ReactTestUtils'); diff --git a/src/node_modules/react-native/index.js b/src/node_modules/react-native/index.js new file mode 100644 index 000000000000..7897e25151e7 --- /dev/null +++ b/src/node_modules/react-native/index.js @@ -0,0 +1,9 @@ +/** + * Copyright 2016-present Facebook. All Rights Reserved. + * + * @flow + */ + +'use strict'; + +module.exports = require('ReactNative'); diff --git a/src/node_modules/react-noop-renderer/index.js b/src/node_modules/react-noop-renderer/index.js new file mode 100644 index 000000000000..c690bc1d2a29 --- /dev/null +++ b/src/node_modules/react-noop-renderer/index.js @@ -0,0 +1,9 @@ +/** + * Copyright 2016-present Facebook. All Rights Reserved. + * + * @flow + */ + +'use strict'; + +module.exports = require('ReactNoop'); diff --git a/src/node_modules/react-test-renderer/shallow.js b/src/node_modules/react-test-renderer/shallow.js new file mode 100644 index 000000000000..952234166011 --- /dev/null +++ b/src/node_modules/react-test-renderer/shallow.js @@ -0,0 +1,9 @@ +/** + * Copyright 2016-present Facebook. All Rights Reserved. + * + * @flow + */ + +'use strict'; + +module.exports = require('ReactShallowRenderer'); diff --git a/src/renderers/__tests__/EventPluginHub-test.js b/src/renderers/__tests__/EventPluginHub-test.js index a94ae72bc3a4..03b33abe00b0 100644 --- a/src/renderers/__tests__/EventPluginHub-test.js +++ b/src/renderers/__tests__/EventPluginHub-test.js @@ -20,7 +20,7 @@ describe('EventPluginHub', () => { beforeEach(() => { jest.resetModules(); React = require('react'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); }); it('should prevent non-function listeners, at dispatch', () => { diff --git a/src/renderers/__tests__/ReactChildReconciler-test.js b/src/renderers/__tests__/ReactChildReconciler-test.js index f6761ef181ec..4ad42d83457c 100644 --- a/src/renderers/__tests__/ReactChildReconciler-test.js +++ b/src/renderers/__tests__/ReactChildReconciler-test.js @@ -26,7 +26,7 @@ describe('ReactChildReconciler', () => { jest.resetModules(); React = require('react'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); }); function createIterable(array) { diff --git a/src/renderers/__tests__/ReactComponent-test.js b/src/renderers/__tests__/ReactComponent-test.js index 1ea4d6dddce5..30503913da05 100644 --- a/src/renderers/__tests__/ReactComponent-test.js +++ b/src/renderers/__tests__/ReactComponent-test.js @@ -25,7 +25,7 @@ describe('ReactComponent', () => { React = require('react'); ReactDOM = require('react-dom'); ReactDOMFeatureFlags = require('ReactDOMFeatureFlags'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); }); it('should throw on invalid render targets', () => { diff --git a/src/renderers/__tests__/ReactComponentLifeCycle-test.js b/src/renderers/__tests__/ReactComponentLifeCycle-test.js index af575d153071..519ab4c55966 100644 --- a/src/renderers/__tests__/ReactComponentLifeCycle-test.js +++ b/src/renderers/__tests__/ReactComponentLifeCycle-test.js @@ -91,7 +91,7 @@ describe('ReactComponentLifeCycle', () => { jest.resetModules(); React = require('react'); ReactDOM = require('react-dom'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); PropTypes = require('prop-types'); }); diff --git a/src/renderers/__tests__/ReactCompositeComponent-test.js b/src/renderers/__tests__/ReactCompositeComponent-test.js index 5640ce619603..df10b8886752 100644 --- a/src/renderers/__tests__/ReactCompositeComponent-test.js +++ b/src/renderers/__tests__/ReactCompositeComponent-test.js @@ -28,8 +28,9 @@ describe('ReactCompositeComponent', () => { React = require('react'); ReactDOM = require('react-dom'); ReactDOMServer = require('react-dom/server'); - ReactCurrentOwner = require('ReactCurrentOwner'); - ReactTestUtils = require('ReactTestUtils'); + ReactCurrentOwner = require('react') + .__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner; + ReactTestUtils = require('react-dom/test-utils'); PropTypes = require('prop-types'); shallowEqual = require('fbjs/lib/shallowEqual'); diff --git a/src/renderers/__tests__/ReactCompositeComponentDOMMinimalism-test.js b/src/renderers/__tests__/ReactCompositeComponentDOMMinimalism-test.js index 3391470f81fb..bc26fcea5a27 100644 --- a/src/renderers/__tests__/ReactCompositeComponentDOMMinimalism-test.js +++ b/src/renderers/__tests__/ReactCompositeComponentDOMMinimalism-test.js @@ -31,7 +31,7 @@ describe('ReactCompositeComponentDOMMinimalism', () => { beforeEach(() => { React = require('react'); ReactDOM = require('react-dom'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); LowerLevelComposite = class extends React.Component { render() { diff --git a/src/renderers/__tests__/ReactCompositeComponentNestedState-test.js b/src/renderers/__tests__/ReactCompositeComponentNestedState-test.js index 4480a2231f4f..aec1d92f72c6 100644 --- a/src/renderers/__tests__/ReactCompositeComponentNestedState-test.js +++ b/src/renderers/__tests__/ReactCompositeComponentNestedState-test.js @@ -19,7 +19,7 @@ describe('ReactCompositeComponentNestedState-state', () => { beforeEach(() => { React = require('react'); ReactDOM = require('react-dom'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); }); it('should provide up to date values for props', () => { diff --git a/src/renderers/__tests__/ReactEmptyComponent-test.js b/src/renderers/__tests__/ReactEmptyComponent-test.js index 06ac9c483f63..5368ae06a909 100644 --- a/src/renderers/__tests__/ReactEmptyComponent-test.js +++ b/src/renderers/__tests__/ReactEmptyComponent-test.js @@ -26,7 +26,7 @@ describe('ReactEmptyComponent', () => { React = require('react'); ReactDOM = require('react-dom'); ReactDOMFeatureFlags = require('ReactDOMFeatureFlags'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); log = jasmine.createSpy(); diff --git a/src/renderers/__tests__/ReactIdentity-test.js b/src/renderers/__tests__/ReactIdentity-test.js index 7837e7f3341d..9bcc07a9fd9b 100644 --- a/src/renderers/__tests__/ReactIdentity-test.js +++ b/src/renderers/__tests__/ReactIdentity-test.js @@ -20,7 +20,7 @@ describe('ReactIdentity', () => { jest.resetModules(); React = require('react'); ReactDOM = require('react-dom'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); }); it('should allow key property to express identity', () => { diff --git a/src/renderers/__tests__/ReactMockedComponent-test.js b/src/renderers/__tests__/ReactMockedComponent-test.js index 061094b511c2..7f7427e0c4af 100644 --- a/src/renderers/__tests__/ReactMockedComponent-test.js +++ b/src/renderers/__tests__/ReactMockedComponent-test.js @@ -21,8 +21,8 @@ var ReactDOMServer; describe('ReactMockedComponent', () => { beforeEach(() => { React = require('react'); - ReactTestUtils = require('ReactTestUtils'); - ReactDOMServer = require('ReactDOMServer'); + ReactTestUtils = require('react-dom/test-utils'); + ReactDOMServer = require('react-dom/server'); AutoMockedComponent = jest.genMockFromModule( 'ReactMockedComponentTestComponent', diff --git a/src/renderers/__tests__/ReactMultiChildText-test.js b/src/renderers/__tests__/ReactMultiChildText-test.js index 199ed41d2e3a..53daf5813538 100644 --- a/src/renderers/__tests__/ReactMultiChildText-test.js +++ b/src/renderers/__tests__/ReactMultiChildText-test.js @@ -14,7 +14,7 @@ var React = require('react'); var ReactDOM = require('react-dom'); var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags'); -var ReactTestUtils = require('ReactTestUtils'); +var ReactTestUtils = require('react-dom/test-utils'); // Helpers var testAllPermutations = function(testCases) { diff --git a/src/renderers/__tests__/ReactTreeTraversal-test.js b/src/renderers/__tests__/ReactTreeTraversal-test.js index da17f4d25781..89d479c2a485 100644 --- a/src/renderers/__tests__/ReactTreeTraversal-test.js +++ b/src/renderers/__tests__/ReactTreeTraversal-test.js @@ -12,8 +12,9 @@ 'use strict'; var React = require('react'); +// TODO: can we express this test with only public API? var ReactDOMComponentTree = require('ReactDOMComponentTree'); -var ReactTestUtils = require('ReactTestUtils'); +var ReactTestUtils = require('react-dom/test-utils'); /** * Ensure that all callbacks are invoked, passing this unique argument. diff --git a/src/renderers/__tests__/ReactUpdates-test.js b/src/renderers/__tests__/ReactUpdates-test.js index cb5eeb8ddc2b..709497fad9fa 100644 --- a/src/renderers/__tests__/ReactUpdates-test.js +++ b/src/renderers/__tests__/ReactUpdates-test.js @@ -21,7 +21,7 @@ describe('ReactUpdates', () => { React = require('react'); ReactDOM = require('react-dom'); ReactDOMFeatureFlags = require('ReactDOMFeatureFlags'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); }); it('should batch state when updating state twice', () => { diff --git a/src/renderers/__tests__/refs-destruction-test.js b/src/renderers/__tests__/refs-destruction-test.js index b691851c34b1..84793d0d0ce1 100644 --- a/src/renderers/__tests__/refs-destruction-test.js +++ b/src/renderers/__tests__/refs-destruction-test.js @@ -23,7 +23,7 @@ describe('refs-destruction', () => { React = require('react'); ReactDOM = require('react-dom'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); TestComponent = class extends React.Component { render() { diff --git a/src/renderers/__tests__/refs-test.js b/src/renderers/__tests__/refs-test.js index 05727c764d2d..c7f3f8ce7bd1 100644 --- a/src/renderers/__tests__/refs-test.js +++ b/src/renderers/__tests__/refs-test.js @@ -13,7 +13,7 @@ var React = require('react'); var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags'); -var ReactTestUtils = require('ReactTestUtils'); +var ReactTestUtils = require('react-dom/test-utils'); /** * Counts clicks and has a renders an item for each click. Each item rendered diff --git a/src/renderers/art/__tests__/ReactART-test.js b/src/renderers/art/__tests__/ReactART-test.js index 8006051d14f5..48b718363ed3 100644 --- a/src/renderers/art/__tests__/ReactART-test.js +++ b/src/renderers/art/__tests__/ReactART-test.js @@ -15,7 +15,7 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var ReactTestUtils = require('ReactTestUtils'); +var ReactTestUtils = require('react-dom/test-utils'); var Group; var Shape; @@ -24,7 +24,7 @@ var TestComponent; var Missing = {}; -var ReactART = require('ReactARTFiber'); +var ReactART = require('react-art'); var ARTSVGMode = require('art/modes/svg'); var ARTCurrentMode = require('art/modes/current'); diff --git a/src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js b/src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js index c659d65123e5..383928e07ace 100644 --- a/src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js +++ b/src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js @@ -14,7 +14,7 @@ var React = require('react'); var ReactDOM = require('react-dom'); var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags'); -var ReactTestUtils = require('ReactTestUtils'); +var ReactTestUtils = require('react-dom/test-utils'); var PropTypes = require('prop-types'); describe('ReactDOMFiber', () => { diff --git a/src/renderers/dom/shared/__tests__/CSSProperty-test.js b/src/renderers/dom/shared/__tests__/CSSProperty-test.js index a3c04d706d6c..f724f20cd5aa 100644 --- a/src/renderers/dom/shared/__tests__/CSSProperty-test.js +++ b/src/renderers/dom/shared/__tests__/CSSProperty-test.js @@ -16,6 +16,7 @@ describe('CSSProperty', () => { beforeEach(() => { jest.resetModules(); + // TODO: can we express this test with only public API? CSSProperty = require('CSSProperty'); }); diff --git a/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js b/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js index 5fcc92a825aa..c0607871e55a 100644 --- a/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js +++ b/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js @@ -21,6 +21,7 @@ describe('DOMPropertyOperations', () => { var ReactDOMInjection = require('ReactDOMInjection'); ReactDOMInjection.inject(); + // TODO: can we express this test with only public API? DOMPropertyOperations = require('DOMPropertyOperations'); DOMProperty = require('DOMProperty'); ReactDOMComponentTree = require('ReactDOMComponentTree'); diff --git a/src/renderers/dom/shared/__tests__/ReactBrowserEventEmitter-test.js b/src/renderers/dom/shared/__tests__/ReactBrowserEventEmitter-test.js index c08384e46e4c..6239a6ac112a 100644 --- a/src/renderers/dom/shared/__tests__/ReactBrowserEventEmitter-test.js +++ b/src/renderers/dom/shared/__tests__/ReactBrowserEventEmitter-test.js @@ -60,13 +60,14 @@ describe('ReactBrowserEventEmitter', () => { jest.resetModules(); LISTENER.mockClear(); EventListener = require('fbjs/lib/EventListener'); + // TODO: can we express this test with only public API? EventPluginHub = require('EventPluginHub'); EventPluginRegistry = require('EventPluginRegistry'); React = require('react'); ReactDOM = require('react-dom'); ReactDOMComponentTree = require('ReactDOMComponentTree'); ReactBrowserEventEmitter = require('ReactBrowserEventEmitter'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); TapEventPlugin = require('TapEventPlugin'); var container = document.createElement('div'); diff --git a/src/renderers/dom/shared/__tests__/ReactDOM-test.js b/src/renderers/dom/shared/__tests__/ReactDOM-test.js index 1f5455883393..b7e2db7b6cdc 100644 --- a/src/renderers/dom/shared/__tests__/ReactDOM-test.js +++ b/src/renderers/dom/shared/__tests__/ReactDOM-test.js @@ -13,7 +13,7 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var ReactTestUtils = require('ReactTestUtils'); +var ReactTestUtils = require('react-dom/test-utils'); describe('ReactDOM', () => { // TODO: uncomment this test once we can run in phantom, which diff --git a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js index 61deddb89fdd..394cb5a74c98 100644 --- a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js +++ b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js @@ -29,7 +29,8 @@ describe('ReactDOMComponent', () => { ReactDOM = require('react-dom'); ReactDOMFeatureFlags = require('ReactDOMFeatureFlags'); ReactDOMServer = require('react-dom/server'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); + // TODO: can we express this test with only public API? inputValueTracking = require('inputValueTracking'); }); diff --git a/src/renderers/dom/shared/__tests__/ReactDOMComponentTree-test.js b/src/renderers/dom/shared/__tests__/ReactDOMComponentTree-test.js index bad5116766b9..369420522bb4 100644 --- a/src/renderers/dom/shared/__tests__/ReactDOMComponentTree-test.js +++ b/src/renderers/dom/shared/__tests__/ReactDOMComponentTree-test.js @@ -41,6 +41,7 @@ describe('ReactDOMComponentTree', () => { beforeEach(() => { React = require('react'); ReactDOM = require('react-dom'); + // TODO: can we express this test with only public API? ReactDOMComponentTree = require('ReactDOMComponentTree'); ReactDOMServer = require('react-dom/server'); }); diff --git a/src/renderers/dom/shared/__tests__/ReactDOMEventListener-test.js b/src/renderers/dom/shared/__tests__/ReactDOMEventListener-test.js index e80d40d6dd7a..810038763dc6 100644 --- a/src/renderers/dom/shared/__tests__/ReactDOMEventListener-test.js +++ b/src/renderers/dom/shared/__tests__/ReactDOMEventListener-test.js @@ -25,9 +25,10 @@ describe('ReactDOMEventListener', () => { jest.resetModules(); React = require('react'); ReactDOM = require('react-dom'); + // TODO: can we express this test with only public API? ReactDOMComponentTree = require('ReactDOMComponentTree'); ReactDOMEventListener = require('ReactDOMEventListener'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); handleTopLevel = jest.fn(); ReactDOMEventListener._handleTopLevel = handleTopLevel; diff --git a/src/renderers/dom/shared/__tests__/ReactDOMInvalidARIAHook-test.js b/src/renderers/dom/shared/__tests__/ReactDOMInvalidARIAHook-test.js index 65b51fff7185..60303ec95e8d 100644 --- a/src/renderers/dom/shared/__tests__/ReactDOMInvalidARIAHook-test.js +++ b/src/renderers/dom/shared/__tests__/ReactDOMInvalidARIAHook-test.js @@ -19,7 +19,7 @@ describe('ReactDOMInvalidARIAHook', () => { beforeEach(() => { jest.resetModules(); React = require('react'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); mountComponent = function(props) { ReactTestUtils.renderIntoDocument(
); diff --git a/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js b/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js index fa23ebc06226..de1adb46f6c6 100644 --- a/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js +++ b/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js @@ -242,11 +242,12 @@ function expectMarkupMismatch(serverElement, clientElement) { function resetModules() { jest.resetModuleRegistry(); PropTypes = require('prop-types'); - React = require('React'); - ReactDOM = require('ReactDOM'); - ReactDOMServer = require('ReactDOMServer'); + React = require('react'); + ReactDOM = require('react-dom'); + ReactDOMServer = require('react-dom/server'); ReactDOMFeatureFlags = require('ReactDOMFeatureFlags'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); + // TODO: can we express this test with only public API? ExecutionEnvironment = require('ExecutionEnvironment'); } diff --git a/src/renderers/dom/shared/__tests__/ReactEventIndependence-test.js b/src/renderers/dom/shared/__tests__/ReactEventIndependence-test.js index 87b00573a646..bc1d4a178a19 100644 --- a/src/renderers/dom/shared/__tests__/ReactEventIndependence-test.js +++ b/src/renderers/dom/shared/__tests__/ReactEventIndependence-test.js @@ -21,7 +21,7 @@ describe('ReactEventIndependence', () => { React = require('react'); ReactDOM = require('react-dom'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); }); it('does not crash with other react inside', () => { diff --git a/src/renderers/dom/shared/__tests__/ReactMount-test.js b/src/renderers/dom/shared/__tests__/ReactMount-test.js index 83e896b76064..3cad1fa973fe 100644 --- a/src/renderers/dom/shared/__tests__/ReactMount-test.js +++ b/src/renderers/dom/shared/__tests__/ReactMount-test.js @@ -24,7 +24,7 @@ describe('ReactMount', () => { React = require('react'); ReactDOM = require('react-dom'); ReactDOMServer = require('react-dom/server'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); try { if (WebComponents === undefined && typeof jest !== 'undefined') { diff --git a/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js b/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js index b51e662f2656..79cca198f013 100644 --- a/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js +++ b/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js @@ -29,9 +29,9 @@ describe('ReactDOMServer', () => { jest.resetModules(); React = require('react'); ReactDOM = require('react-dom'); + ReactTestUtils = require('react-dom/test-utils'); ReactDOMFeatureFlags = require('ReactDOMFeatureFlags'); ReactMarkupChecksum = require('ReactMarkupChecksum'); - ReactTestUtils = require('ReactTestUtils'); ReactReconcileTransaction = require('ReactReconcileTransaction'); PropTypes = require('prop-types'); diff --git a/src/renderers/dom/shared/__tests__/escapeTextContentForBrowser-test.js b/src/renderers/dom/shared/__tests__/escapeTextContentForBrowser-test.js index 8dc2b9792d73..58bfdd7fff8a 100644 --- a/src/renderers/dom/shared/__tests__/escapeTextContentForBrowser-test.js +++ b/src/renderers/dom/shared/__tests__/escapeTextContentForBrowser-test.js @@ -12,6 +12,7 @@ 'use strict'; describe('escapeTextContentForBrowser', () => { + // TODO: can we express this test with only public API? var escapeTextContentForBrowser = require('escapeTextContentForBrowser'); it('should escape boolean to string', () => { diff --git a/src/renderers/dom/shared/__tests__/findDOMNode-test.js b/src/renderers/dom/shared/__tests__/findDOMNode-test.js index 93edc2e2592e..5100971cf54a 100644 --- a/src/renderers/dom/shared/__tests__/findDOMNode-test.js +++ b/src/renderers/dom/shared/__tests__/findDOMNode-test.js @@ -13,7 +13,7 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var ReactTestUtils = require('ReactTestUtils'); +var ReactTestUtils = require('react-dom/test-utils'); describe('findDOMNode', () => { it('findDOMNode should return null if passed null', () => { diff --git a/src/renderers/dom/shared/__tests__/inputValueTracking-test.js b/src/renderers/dom/shared/__tests__/inputValueTracking-test.js index 16555ad6a031..2e4bfd1e9677 100644 --- a/src/renderers/dom/shared/__tests__/inputValueTracking-test.js +++ b/src/renderers/dom/shared/__tests__/inputValueTracking-test.js @@ -13,6 +13,7 @@ var React = require('react'); var ReactTestUtils = require('ReactTestUtils'); +// TODO: can we express this test with only public API? var inputValueTracking = require('inputValueTracking'); describe('inputValueTracking', () => { diff --git a/src/renderers/dom/shared/__tests__/quoteAttributeValueForBrowser-test.js b/src/renderers/dom/shared/__tests__/quoteAttributeValueForBrowser-test.js index 884fc322c555..7f8495148ab8 100644 --- a/src/renderers/dom/shared/__tests__/quoteAttributeValueForBrowser-test.js +++ b/src/renderers/dom/shared/__tests__/quoteAttributeValueForBrowser-test.js @@ -12,6 +12,7 @@ 'use strict'; describe('quoteAttributeValueForBrowser', () => { + // TODO: can we express this test with only public API? var quoteAttributeValueForBrowser = require('quoteAttributeValueForBrowser'); it('should escape boolean to string', () => { diff --git a/src/renderers/dom/shared/__tests__/renderSubtreeIntoContainer-test.js b/src/renderers/dom/shared/__tests__/renderSubtreeIntoContainer-test.js index a0a30dfe8d72..43ac5cb5b2b5 100644 --- a/src/renderers/dom/shared/__tests__/renderSubtreeIntoContainer-test.js +++ b/src/renderers/dom/shared/__tests__/renderSubtreeIntoContainer-test.js @@ -14,8 +14,9 @@ var React = require('react'); var PropTypes = require('prop-types'); var ReactDOM = require('react-dom'); -var ReactTestUtils = require('ReactTestUtils'); -var renderSubtreeIntoContainer = require('renderSubtreeIntoContainer'); +var ReactTestUtils = require('react-dom/test-utils'); +var renderSubtreeIntoContainer = require('react-dom') + .unstable_renderSubtreeIntoContainer; describe('renderSubtreeIntoContainer', () => { it('should pass context when rendering subtree elsewhere', () => { diff --git a/src/renderers/dom/shared/__tests__/validateDOMNesting-test.js b/src/renderers/dom/shared/__tests__/validateDOMNesting-test.js index 102322f1b763..74dc3eae329c 100644 --- a/src/renderers/dom/shared/__tests__/validateDOMNesting-test.js +++ b/src/renderers/dom/shared/__tests__/validateDOMNesting-test.js @@ -137,6 +137,7 @@ describe('ReactContextValidator', () => { beforeEach(() => { jest.resetModules(); + // TODO: can we express this test with only public API? validateDOMNesting = require('validateDOMNesting'); }); diff --git a/src/renderers/dom/shared/eventPlugins/__tests__/BeforeInputEventPlugin-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/BeforeInputEventPlugin-test.js index 46dbcf490da1..28785406e7fc 100644 --- a/src/renderers/dom/shared/eventPlugins/__tests__/BeforeInputEventPlugin-test.js +++ b/src/renderers/dom/shared/eventPlugins/__tests__/BeforeInputEventPlugin-test.js @@ -48,6 +48,8 @@ describe('BeforeInputEventPlugin', function() { // Modules which have dependency on BeforeInputEventPlugin are stored // in ModuleCache so that we can use these modules ouside test functions. this.ReactDOM = require('react-dom'); + + // TODO: can we express this test with only public API? this.ReactDOMComponentTree = require('ReactDOMComponentTree'); this.SyntheticCompositionEvent = require('SyntheticCompositionEvent'); this.SyntheticInputEvent = require('SyntheticInputEvent'); diff --git a/src/renderers/dom/shared/eventPlugins/__tests__/ChangeEventPlugin-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/ChangeEventPlugin-test.js index f1978fad3aa8..d164a2505190 100644 --- a/src/renderers/dom/shared/eventPlugins/__tests__/ChangeEventPlugin-test.js +++ b/src/renderers/dom/shared/eventPlugins/__tests__/ChangeEventPlugin-test.js @@ -13,7 +13,8 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var ReactTestUtils = require('ReactTestUtils'); +var ReactTestUtils = require('react-dom/test-utils'); +// TODO: can we express this test with only public API? var ChangeEventPlugin = require('ChangeEventPlugin'); var inputValueTracking = require('inputValueTracking'); diff --git a/src/renderers/dom/shared/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js index 010e151a4541..2d7a6d426fe1 100644 --- a/src/renderers/dom/shared/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js +++ b/src/renderers/dom/shared/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js @@ -20,10 +20,11 @@ describe('EnterLeaveEventPlugin', () => { beforeEach(() => { jest.resetModules(); - EnterLeaveEventPlugin = require('EnterLeaveEventPlugin'); React = require('react'); ReactDOM = require('react-dom'); + // TODO: can we express this test with only public API? ReactDOMComponentTree = require('ReactDOMComponentTree'); + EnterLeaveEventPlugin = require('EnterLeaveEventPlugin'); }); it('should set relatedTarget properly in iframe', () => { diff --git a/src/renderers/dom/shared/eventPlugins/__tests__/FallbackCompositionState-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/FallbackCompositionState-test.js index 35eca38ac933..19af12471c5c 100644 --- a/src/renderers/dom/shared/eventPlugins/__tests__/FallbackCompositionState-test.js +++ b/src/renderers/dom/shared/eventPlugins/__tests__/FallbackCompositionState-test.js @@ -17,6 +17,7 @@ describe('FallbackCompositionState', () => { var TEXT = 'Hello world'; beforeEach(() => { + // TODO: can we express this test with only public API? FallbackCompositionState = require('FallbackCompositionState'); }); diff --git a/src/renderers/dom/shared/eventPlugins/__tests__/SelectEventPlugin-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/SelectEventPlugin-test.js index cda04a350209..c649dda7c6fa 100644 --- a/src/renderers/dom/shared/eventPlugins/__tests__/SelectEventPlugin-test.js +++ b/src/renderers/dom/shared/eventPlugins/__tests__/SelectEventPlugin-test.js @@ -30,8 +30,9 @@ describe('SelectEventPlugin', () => { beforeEach(() => { React = require('react'); ReactDOM = require('react-dom'); + ReactTestUtils = require('react-dom/test-utils'); + // TODO: can we express this test with only public API? ReactDOMComponentTree = require('ReactDOMComponentTree'); - ReactTestUtils = require('ReactTestUtils'); SelectEventPlugin = require('SelectEventPlugin'); }); diff --git a/src/renderers/dom/shared/eventPlugins/__tests__/SimpleEventPlugin-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/SimpleEventPlugin-test.js index 007b7e54f4c1..9fa060766dcb 100644 --- a/src/renderers/dom/shared/eventPlugins/__tests__/SimpleEventPlugin-test.js +++ b/src/renderers/dom/shared/eventPlugins/__tests__/SimpleEventPlugin-test.js @@ -36,7 +36,7 @@ describe('SimpleEventPlugin', function() { beforeEach(function() { React = require('react'); ReactDOM = require('react-dom'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); onClick = jest.fn(); }); diff --git a/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticClipboardEvent-test.js b/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticClipboardEvent-test.js index 97f1a47f0ce1..50852b52a5fa 100644 --- a/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticClipboardEvent-test.js +++ b/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticClipboardEvent-test.js @@ -17,6 +17,7 @@ describe('SyntheticClipboardEvent', () => { var createEvent; beforeEach(() => { + // TODO: can we express this test with only public API? SyntheticClipboardEvent = require('SyntheticClipboardEvent'); createEvent = function(nativeEvent) { var target = require('getEventTarget')(nativeEvent); diff --git a/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticEvent-test.js b/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticEvent-test.js index f6ed9cc775e8..f743efc75d08 100644 --- a/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticEvent-test.js +++ b/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticEvent-test.js @@ -20,10 +20,11 @@ describe('SyntheticEvent', () => { var createEvent; beforeEach(() => { + // TODO: can we express this test with only public API? SyntheticEvent = require('SyntheticEvent'); React = require('react'); ReactDOM = require('react-dom'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); createEvent = function(nativeEvent) { var target = require('getEventTarget')(nativeEvent); diff --git a/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticKeyboardEvent-test.js b/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticKeyboardEvent-test.js index 3b433e91842b..7bd3d6c7b919 100644 --- a/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticKeyboardEvent-test.js +++ b/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticKeyboardEvent-test.js @@ -22,6 +22,7 @@ describe('SyntheticKeyboardEvent', () => { jest.mock('getEventCharCode'); getEventCharCode = require('getEventCharCode'); + // TODO: can we express this test with only public API? SyntheticKeyboardEvent = require('SyntheticKeyboardEvent'); createEvent = function(nativeEvent) { var target = require('getEventTarget')(nativeEvent); diff --git a/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticWheelEvent-test.js b/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticWheelEvent-test.js index 393ccf3fc6c2..793822994a82 100644 --- a/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticWheelEvent-test.js +++ b/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticWheelEvent-test.js @@ -17,6 +17,7 @@ describe('SyntheticWheelEvent', () => { var createEvent; beforeEach(() => { + // TODO: can we express this test with only public API? SyntheticWheelEvent = require('SyntheticWheelEvent'); createEvent = function(nativeEvent) { diff --git a/src/renderers/dom/shared/utils/__tests__/getEventCharCode-test.js b/src/renderers/dom/shared/utils/__tests__/getEventCharCode-test.js index f619093b8b47..8ccf36691e7a 100644 --- a/src/renderers/dom/shared/utils/__tests__/getEventCharCode-test.js +++ b/src/renderers/dom/shared/utils/__tests__/getEventCharCode-test.js @@ -11,6 +11,7 @@ 'use strict'; +// TODO: can we express this test with only public API? var getEventCharCode = require('getEventCharCode'); describe('getEventCharCode', () => { diff --git a/src/renderers/dom/shared/utils/__tests__/getEventKey-test.js b/src/renderers/dom/shared/utils/__tests__/getEventKey-test.js index 81b370255d15..ad776a3719dd 100644 --- a/src/renderers/dom/shared/utils/__tests__/getEventKey-test.js +++ b/src/renderers/dom/shared/utils/__tests__/getEventKey-test.js @@ -11,6 +11,7 @@ 'use strict'; +// TODO: can we express this test with only public API? var getEventKey = require('getEventKey'); describe('getEventKey', () => { diff --git a/src/renderers/dom/shared/utils/__tests__/getNodeForCharacterOffset-test.js b/src/renderers/dom/shared/utils/__tests__/getNodeForCharacterOffset-test.js index 27c7d1cd2db4..af35794f2e4c 100644 --- a/src/renderers/dom/shared/utils/__tests__/getNodeForCharacterOffset-test.js +++ b/src/renderers/dom/shared/utils/__tests__/getNodeForCharacterOffset-test.js @@ -13,6 +13,7 @@ var getTestDocument = require('getTestDocument'); +// TODO: can we express this test with only public API? var getNodeForCharacterOffset = require('getNodeForCharacterOffset'); // Create node from HTML string diff --git a/src/renderers/dom/shared/utils/__tests__/setInnerHTML-test.js b/src/renderers/dom/shared/utils/__tests__/setInnerHTML-test.js index e89f9f142b3e..1f703f97e5a3 100644 --- a/src/renderers/dom/shared/utils/__tests__/setInnerHTML-test.js +++ b/src/renderers/dom/shared/utils/__tests__/setInnerHTML-test.js @@ -11,6 +11,7 @@ 'use strict'; +// TODO: can we express this test with only public API? var setInnerHTML = require('setInnerHTML'); var DOMNamespaces = require('DOMNamespaces'); diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMIframe-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMIframe-test.js index 91bb09199470..82ab667059ff 100644 --- a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMIframe-test.js +++ b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMIframe-test.js @@ -19,7 +19,7 @@ describe('ReactDOMIframe', () => { beforeEach(() => { React = require('react'); ReactDOM = require('react-dom'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); }); it('should trigger load events', () => { diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js index d1bce20e7848..f69b3c91b101 100644 --- a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js +++ b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js @@ -38,7 +38,8 @@ describe('ReactDOMInput', () => { ReactDOM = require('react-dom'); ReactDOMServer = require('react-dom/server'); ReactDOMFeatureFlags = require('ReactDOMFeatureFlags'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); + // TODO: can we express this test with only public API? inputValueTracking = require('inputValueTracking'); spyOn(console, 'error'); }); diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMOption-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMOption-test.js index 8a1b157cd235..7d0dda61f068 100644 --- a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMOption-test.js +++ b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMOption-test.js @@ -25,7 +25,7 @@ describe('ReactDOMOption', () => { React = require('react'); ReactDOM = require('react-dom'); ReactDOMFeatureFlags = require('ReactDOMFeatureFlags'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); }); it('should flatten children to a string', () => { diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMSelect-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMSelect-test.js index efd29196ddff..5aa28eff34ec 100644 --- a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMSelect-test.js +++ b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMSelect-test.js @@ -23,7 +23,7 @@ describe('ReactDOMSelect', () => { React = require('react'); ReactDOM = require('react-dom'); ReactDOMServer = require('react-dom/server'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); }); it('should allow setting `defaultValue`', () => { diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMTextarea-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMTextarea-test.js index 254973dcc751..dda7235c2752 100644 --- a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMTextarea-test.js +++ b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMTextarea-test.js @@ -25,7 +25,7 @@ describe('ReactDOMTextarea', () => { React = require('react'); ReactDOM = require('react-dom'); ReactDOMServer = require('react-dom/server'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); renderTextarea = function(component, container) { if (!container) { diff --git a/src/renderers/dom/test/__tests__/ReactTestUtils-test.js b/src/renderers/dom/test/__tests__/ReactTestUtils-test.js index 2623e0fa8939..624bc9c9fed7 100644 --- a/src/renderers/dom/test/__tests__/ReactTestUtils-test.js +++ b/src/renderers/dom/test/__tests__/ReactTestUtils-test.js @@ -20,12 +20,12 @@ let ReactTestUtils; describe('ReactTestUtils', () => { beforeEach(() => { - createRenderer = require('ReactShallowRenderer').createRenderer; + createRenderer = require('react-test-renderer/shallow').createRenderer; PropTypes = require('prop-types'); React = require('react'); ReactDOM = require('react-dom'); ReactDOMServer = require('react-dom/server'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-dom/test-utils'); }); it('should call all of the lifecycle hooks', () => { diff --git a/src/renderers/native/__tests__/ReactNativeEvents-test.js b/src/renderers/native/__tests__/ReactNativeEvents-test.js index 495f51338aeb..5a43e47c8df1 100644 --- a/src/renderers/native/__tests__/ReactNativeEvents-test.js +++ b/src/renderers/native/__tests__/ReactNativeEvents-test.js @@ -25,7 +25,7 @@ beforeEach(() => { PropTypes = require('prop-types'); RCTEventEmitter = require('RCTEventEmitter'); React = require('react'); - ReactNative = require('ReactNative'); + ReactNative = require('react-native'); ResponderEventPlugin = require('ResponderEventPlugin'); UIManager = require('UIManager'); createReactNativeComponentClass = require('createReactNativeComponentClass'); diff --git a/src/renderers/native/__tests__/ReactNativeMount-test.js b/src/renderers/native/__tests__/ReactNativeMount-test.js index 2328b49065c2..9b4556dbaaf8 100644 --- a/src/renderers/native/__tests__/ReactNativeMount-test.js +++ b/src/renderers/native/__tests__/ReactNativeMount-test.js @@ -21,7 +21,7 @@ describe('ReactNative', () => { jest.resetModules(); React = require('react'); - ReactNative = require('ReactNative'); + ReactNative = require('react-native'); UIManager = require('UIManager'); createReactNativeComponentClass = require('createReactNativeComponentClass'); }); diff --git a/src/renderers/native/__tests__/createReactNativeComponentClass-test.js b/src/renderers/native/__tests__/createReactNativeComponentClass-test.js index 2a8b794e5b13..58b7614ecdc2 100644 --- a/src/renderers/native/__tests__/createReactNativeComponentClass-test.js +++ b/src/renderers/native/__tests__/createReactNativeComponentClass-test.js @@ -21,8 +21,8 @@ describe('createReactNativeComponentClass', () => { jest.resetModules(); createReactNativeComponentClass = require('createReactNativeComponentClass'); - React = require('React'); - ReactNative = require('ReactNative'); + React = require('react'); + ReactNative = require('react-native'); }); it('should register viewConfigs', () => { diff --git a/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js b/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js index f54d5c180e65..a331ffcc4435 100644 --- a/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js +++ b/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js @@ -20,7 +20,8 @@ describe('ReactCoroutine', () => { beforeEach(() => { jest.resetModules(); React = require('react'); - ReactNoop = require('ReactNoop'); + ReactNoop = require('react-noop-renderer'); + // TODO: can we express this test with only public API? ReactCoroutine = require('ReactCoroutine'); ReactFeatureFlags = require('ReactFeatureFlags'); ReactFeatureFlags.disableNewFiberFeatures = false; diff --git a/src/renderers/shared/fiber/__tests__/ReactFiberHostContext-test.js b/src/renderers/shared/fiber/__tests__/ReactFiberHostContext-test.js index b39352987c9e..7d2b5fd11b91 100644 --- a/src/renderers/shared/fiber/__tests__/ReactFiberHostContext-test.js +++ b/src/renderers/shared/fiber/__tests__/ReactFiberHostContext-test.js @@ -17,7 +17,8 @@ var ReactFiberReconciler; describe('ReactFiberHostContext', () => { beforeEach(() => { jest.resetModules(); - React = require('React'); + React = require('react'); + // TODO: can we express this test with only public API? ReactFiberReconciler = require('ReactFiberReconciler'); }); diff --git a/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js b/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js index 5bfa7066ccc2..7b5e891b51c2 100644 --- a/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js +++ b/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js @@ -20,7 +20,7 @@ describe('ReactIncremental', () => { beforeEach(() => { jest.resetModules(); React = require('react'); - ReactNoop = require('ReactNoop'); + ReactNoop = require('react-noop-renderer'); PropTypes = require('prop-types'); ReactFeatureFlags = require('ReactFeatureFlags'); diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js index 6e9581c2b0a0..3bec2f0f5283 100644 --- a/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js +++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js @@ -21,7 +21,7 @@ describe('ReactIncrementalErrorHandling', () => { jest.resetModules(); PropTypes = require('prop-types'); React = require('react'); - ReactNoop = require('ReactNoop'); + ReactNoop = require('react-noop-renderer'); ReactFeatureFlags = require('ReactFeatureFlags'); ReactFeatureFlags.disableNewFiberFeatures = false; }); diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js index 6504dac2bfc2..e18599b66ed2 100644 --- a/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js +++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js @@ -116,11 +116,12 @@ describe('ReactDebugFiberPerf', () => { global.performance = createUserTimingPolyfill(); // Import after the polyfill is set up: - React = require('React'); + React = require('react'); + ReactNoop = require('react-noop-renderer'); + // TODO: can we express this test with only public API? ReactCoroutine = require('ReactCoroutine'); - ReactFeatureFlags = require('ReactFeatureFlags'); - ReactNoop = require('ReactNoop'); ReactPortal = require('ReactPortal'); + ReactFeatureFlags = require('ReactFeatureFlags'); ReactFeatureFlags.disableNewFiberFeatures = false; PropTypes = require('prop-types'); }); diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js index 55a6227022c7..3181061fa89a 100644 --- a/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js +++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js @@ -19,7 +19,7 @@ describe('ReactIncrementalReflection', () => { beforeEach(() => { jest.resetModules(); React = require('react'); - ReactNoop = require('ReactNoop'); + ReactNoop = require('react-noop-renderer'); ReactFeatureFlags = require('ReactFeatureFlags'); ReactFeatureFlags.disableNewFiberFeatures = false; }); diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalScheduling-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalScheduling-test.js index 8bc9176ef3e8..f72737520a36 100644 --- a/src/renderers/shared/fiber/__tests__/ReactIncrementalScheduling-test.js +++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalScheduling-test.js @@ -19,7 +19,7 @@ describe('ReactIncrementalScheduling', () => { beforeEach(() => { jest.resetModules(); React = require('react'); - ReactNoop = require('ReactNoop'); + ReactNoop = require('react-noop-renderer'); ReactFeatureFlags = require('ReactFeatureFlags'); ReactFeatureFlags.disableNewFiberFeatures = false; }); diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js index 43aa4e4980ea..7e0605eceae6 100644 --- a/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js +++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js @@ -19,7 +19,7 @@ describe('ReactIncrementalSideEffects', () => { beforeEach(() => { jest.resetModules(); React = require('react'); - ReactNoop = require('ReactNoop'); + ReactNoop = require('react-noop-renderer'); ReactFeatureFlags = require('ReactFeatureFlags'); ReactFeatureFlags.disableNewFiberFeatures = false; }); diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js index 2483732fc146..39d92961f289 100644 --- a/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js +++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js @@ -19,7 +19,7 @@ describe('ReactIncrementalUpdates', () => { beforeEach(() => { jest.resetModuleRegistry(); React = require('react'); - ReactNoop = require('ReactNoop'); + ReactNoop = require('react-noop-renderer'); ReactFeatureFlags = require('ReactFeatureFlags'); ReactFeatureFlags.disableNewFiberFeatures = false; }); diff --git a/src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js b/src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js index 5e051eda3408..7f1fb9f3cc27 100644 --- a/src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js +++ b/src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js @@ -21,7 +21,7 @@ describe('ReactTopLevelFragment', function() { beforeEach(function() { jest.resetModules(); React = require('react'); - ReactNoop = require('ReactNoop'); + ReactNoop = require('react-noop-renderer'); ReactFeatureFlags = require('ReactFeatureFlags'); ReactFeatureFlags.disableNewFiberFeatures = false; }); diff --git a/src/renderers/shared/fiber/__tests__/ReactTopLevelText-test.js b/src/renderers/shared/fiber/__tests__/ReactTopLevelText-test.js index 99e5c59b3730..24ab990946c1 100644 --- a/src/renderers/shared/fiber/__tests__/ReactTopLevelText-test.js +++ b/src/renderers/shared/fiber/__tests__/ReactTopLevelText-test.js @@ -21,7 +21,7 @@ describe('ReactTopLevelText', () => { beforeEach(() => { jest.resetModules(); React = require('react'); - ReactNoop = require('ReactNoop'); + ReactNoop = require('react-noop-renderer'); ReactFeatureFlags = require('ReactFeatureFlags'); ReactFeatureFlags.disableNewFiberFeatures = false; }); diff --git a/src/renderers/shared/shared/event/__tests__/EventPluginRegistry-test.js b/src/renderers/shared/shared/event/__tests__/EventPluginRegistry-test.js index cc8f6c45b65f..9655291bcbf0 100644 --- a/src/renderers/shared/shared/event/__tests__/EventPluginRegistry-test.js +++ b/src/renderers/shared/shared/event/__tests__/EventPluginRegistry-test.js @@ -17,6 +17,7 @@ describe('EventPluginRegistry', () => { beforeEach(() => { jest.resetModuleRegistry(); + // TODO: can we express this test with only public API? EventPluginRegistry = require('EventPluginRegistry'); createPlugin = function(properties) { diff --git a/src/renderers/shared/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js b/src/renderers/shared/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js index 336f76fde5d6..4a83a8bb35c3 100644 --- a/src/renderers/shared/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js +++ b/src/renderers/shared/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js @@ -383,6 +383,7 @@ describe('ResponderEventPlugin', () => { beforeEach(() => { jest.resetModules(); + // TODO: can we express this test with only public API? EventPluginHub = require('EventPluginHub'); EventPluginUtils = require('EventPluginUtils'); ResponderEventPlugin = require('ResponderEventPlugin'); diff --git a/src/renderers/shared/utils/__tests__/ReactErrorUtils-test.js b/src/renderers/shared/utils/__tests__/ReactErrorUtils-test.js index ceb8c98be580..327e5290116f 100644 --- a/src/renderers/shared/utils/__tests__/ReactErrorUtils-test.js +++ b/src/renderers/shared/utils/__tests__/ReactErrorUtils-test.js @@ -15,6 +15,7 @@ var ReactErrorUtils; describe('ReactErrorUtils', () => { beforeEach(() => { + // TODO: can we express this test with only public API? ReactErrorUtils = require('ReactErrorUtils'); });