Use public API in tests wherever possible

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', () => {

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 (
           <div>
-            {onlyChild(this.props.children, this.props.mapFn, this)}
+            {React.Children.only(this.props.children, this.props.mapFn, this)}
           </div>
         );
       }
@@ -38,7 +36,7 @@ describe('onlyChild', () => {
           <span />
         </WrapComponent>
       );
-      onlyChild(instance.props.children);
+      React.Children.only(instance.props.children);
     }).toThrow();
   });
 
@@ -49,7 +47,7 @@ describe('onlyChild', () => {
           {null}
         </WrapComponent>
       );
-      onlyChild(instance.props.children);
+      React.Children.only(instance.props.children);
     }).toThrow();
 
     expect(function() {
@@ -58,7 +56,7 @@ describe('onlyChild', () => {
           {undefined}
         </WrapComponent>
       );
-      onlyChild(instance.props.children);
+      React.Children.only(instance.props.children);
     }).toThrow();
   });
 
@@ -69,7 +67,7 @@ describe('onlyChild', () => {
           {[<span key="abc" />]}
         </WrapComponent>
       );
-      onlyChild(instance.props.children);
+      React.Children.only(instance.props.children);
     }).toThrow();
   });
 
@@ -80,7 +78,7 @@ describe('onlyChild', () => {
           {<span />}
         </WrapComponent>
       );
-      onlyChild(instance.props.children);
+      React.Children.only(instance.props.children);
     }).not.toThrow();
   });
 
@@ -90,6 +88,6 @@ describe('onlyChild', () => {
         <span />
       </WrapComponent>
     );
-    expect(onlyChild(instance.props.children)).toEqual(<span />);
+    expect(React.Children.only(instance.props.children)).toEqual(<span />);
   });
 });

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

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,

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.

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.

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');

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 <div />;

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() {

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', () => {

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) {

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', () => {

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');
   });
 

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');
 

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() {

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', () => {

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();
 

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', () => {

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',

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) {

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.

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', () => {

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() {

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

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');
 

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', () => {

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');
   });
 

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');

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');