diff --git a/src/isomorphic/classic/__tests__/ReactContextValidator-test.js b/src/isomorphic/classic/__tests__/ReactContextValidator-test.js index e2e5aee48b..027c536826 100644 --- a/src/isomorphic/classic/__tests__/ReactContextValidator-test.js +++ b/src/isomorphic/classic/__tests__/ReactContextValidator-test.js @@ -121,9 +121,9 @@ describe('ReactContextValidator', function() { }, }); - var instance = ; - instance = ReactTestUtils.renderIntoDocument(instance); - instance.replaceProps({foo: 'def'}); + var container = document.createElement('div'); + React.render(, container); + React.render(, container); expect(actualComponentWillReceiveProps).toEqual({foo: 'def'}); expect(actualShouldComponentUpdate).toEqual({foo: 'def'}); expect(actualComponentWillUpdate).toEqual({foo: 'def'}); diff --git a/src/renderers/shared/reconciler/__tests__/ReactComponentLifeCycle-test.js b/src/renderers/shared/reconciler/__tests__/ReactComponentLifeCycle-test.js index 0a5a6b2993..e4dd2c400e 100644 --- a/src/renderers/shared/reconciler/__tests__/ReactComponentLifeCycle-test.js +++ b/src/renderers/shared/reconciler/__tests__/ReactComponentLifeCycle-test.js @@ -512,24 +512,18 @@ describe('ReactComponentLifeCycle', function() { }, }); - var instance = ReactTestUtils.renderIntoDocument( - + var container = document.createElement('div'); + React.render( + , + container ); // Since `instance` is a root component, we can set its props. This also // makes Tooltip rerender the tooltip component, which shouldn't throw. - instance.setProps({text: 'dos', tooltipText: 'two'}); - }); - - it('should not allow setProps() called on an unmounted element', - function() { - var PropsToUpdate = React.createClass({ - render: function() { - return
; - }, - }); - var instance = ; - expect(instance.setProps).not.toBeDefined(); + React.render( + , + container + ); }); it('should allow state updates in componentDidMount', function() { @@ -595,7 +589,7 @@ describe('ReactComponentLifeCycle', function() { var container = document.createElement('div'); log = []; - var instance = React.render(, container); + React.render(, container); expect(log).toEqual([ 'outer componentWillMount', 'inner componentWillMount', @@ -604,7 +598,7 @@ describe('ReactComponentLifeCycle', function() { ]); log = []; - instance.setProps({x: 42}); + React.render(, container); expect(log).toEqual([ 'outer componentWillReceiveProps', 'outer shouldComponentUpdate', diff --git a/src/renderers/shared/reconciler/__tests__/ReactCompositeComponent-test.js b/src/renderers/shared/reconciler/__tests__/ReactCompositeComponent-test.js index e30858b648..d58f84c118 100644 --- a/src/renderers/shared/reconciler/__tests__/ReactCompositeComponent-test.js +++ b/src/renderers/shared/reconciler/__tests__/ReactCompositeComponent-test.js @@ -935,7 +935,8 @@ describe('ReactCompositeComponent', function() { }, }); - var comp = ReactTestUtils.renderIntoDocument(); + var container = document.createElement('div'); + var comp = React.render(, container); expect(React.findDOMNode(comp.refs.static0).textContent).toBe('A'); expect(React.findDOMNode(comp.refs.static1).textContent).toBe('B'); @@ -946,7 +947,7 @@ describe('ReactCompositeComponent', function() { // When flipping the order, the refs should update even though the actual // contents do not - comp.setProps({flipped: true}); + React.render(, container); expect(React.findDOMNode(comp.refs.static0).textContent).toBe('B'); expect(React.findDOMNode(comp.refs.static1).textContent).toBe('A'); diff --git a/src/renderers/shared/reconciler/__tests__/ReactCompositeComponentState-test.js b/src/renderers/shared/reconciler/__tests__/ReactCompositeComponentState-test.js index 1547f47f33..fda4de2cec 100644 --- a/src/renderers/shared/reconciler/__tests__/ReactCompositeComponentState-test.js +++ b/src/renderers/shared/reconciler/__tests__/ReactCompositeComponentState-test.js @@ -138,8 +138,9 @@ describe('ReactCompositeComponent-state', function() { this.peekAtState('initial-callback'); } ); - instance.setProps( - {nextColor: 'green'}, + React.render( + , + container, instance.peekAtCallback('setProps') ); instance.setFavoriteColor('blue'); diff --git a/src/renderers/shared/reconciler/__tests__/ReactMultiChildReconcile-test.js b/src/renderers/shared/reconciler/__tests__/ReactMultiChildReconcile-test.js index 4e54164c13..61faf39897 100644 --- a/src/renderers/shared/reconciler/__tests__/ReactMultiChildReconcile-test.js +++ b/src/renderers/shared/reconciler/__tests__/ReactMultiChildReconcile-test.js @@ -15,7 +15,6 @@ require('mock-modules'); var React = require('React'); var ReactInstanceMap = require('ReactInstanceMap'); -var ReactTestUtils = require('ReactTestUtils'); var ReactMount = require('ReactMount'); var mapObject = require('mapObject'); @@ -212,15 +211,20 @@ function verifyDomOrderingAccurate(parentInstance, statusDisplays) { */ function testPropsSequence(sequence) { var i; - var parentInstance = ReactTestUtils.renderIntoDocument( - + var container = document.createElement('div'); + var parentInstance = React.render( + , + container ); var statusDisplays = parentInstance.getStatusDisplays(); var lastInternalStates = getInteralStateByUserName(statusDisplays); verifyStatuses(statusDisplays, sequence[0]); for (i = 1; i < sequence.length; i++) { - parentInstance.replaceProps(sequence[i]); + React.render( + , + container + ); statusDisplays = parentInstance.getStatusDisplays(); verifyStatuses(statusDisplays, sequence[i]); verifyStatesPreserved(lastInternalStates, statusDisplays); @@ -243,19 +247,27 @@ describe('ReactMultiChildReconcile', function() { }, }; - var parentInstance = ReactTestUtils.renderIntoDocument( - + var container = document.createElement('div'); + var parentInstance = React.render( + , + container ); var statusDisplays = parentInstance.getStatusDisplays(); var startingInternalState = statusDisplays.jcw.getInternalState(); // Now remove the child. - parentInstance.replaceProps({usernameToStatus: {} }); + React.render( + , + container + ); statusDisplays = parentInstance.getStatusDisplays(); expect(statusDisplays.jcw).toBeFalsy(); // Now reset the props that cause there to be a child - parentInstance.replaceProps(props); + React.render( + , + container + ); statusDisplays = parentInstance.getStatusDisplays(); expect(statusDisplays.jcw).toBeTruthy(); expect(statusDisplays.jcw.getInternalState())