{[children]}<\/div>;\n expect(console.error.calls.length).toBe(0);\n var container = document.createElement('div');\n- React.render(element, container);\n+ ReactDOM.render(element, container);\n expect(console.error.calls.length).toBe(1);\n expect(console.error.calls[0].args[0]).toContain(\n 'Any use of a keyed object'\n@@ -78,7 +80,7 @@ describe('ReactFragment', function() {\n }\n expect(console.error.calls.length).toBe(0);\n var container = document.createElement('div');\n- React.render(, container);\n+ ReactDOM.render(, container);\n expect(console.error.calls.length).toBe(1);\n expect(console.error.calls[0].args[0]).toContain(\n 'Any use of a keyed object'\ndiff --git a\/src\/addons\/transitions\/ReactCSSTransitionGroupChild.js b\/src\/addons\/transitions\/ReactCSSTransitionGroupChild.js\nindex 1ee292f765..286a979b0e 100644\n--- a\/src\/addons\/transitions\/ReactCSSTransitionGroupChild.js\n+++ b\/src\/addons\/transitions\/ReactCSSTransitionGroupChild.js\n@@ -13,6 +13,7 @@\n 'use strict';\n \n var React = require('React');\n+var ReactDOM = require('ReactDOM');\n \n var CSSCore = require('CSSCore');\n var ReactTransitionEvents = require('ReactTransitionEvents');\n@@ -47,7 +48,7 @@ var ReactCSSTransitionGroupChild = React.createClass({\n displayName: 'ReactCSSTransitionGroupChild',\n \n transition: function(animationType, finishCallback) {\n- var node = React.findDOMNode(this);\n+ var node = ReactDOM.findDOMNode(this);\n \n if (!node) {\n if (finishCallback) {\n@@ -104,7 +105,7 @@ var ReactCSSTransitionGroupChild = React.createClass({\n flushClassNameQueue: function() {\n if (this.isMounted()) {\n this.classNameQueue.forEach(\n- CSSCore.addClass.bind(CSSCore, React.findDOMNode(this))\n+ CSSCore.addClass.bind(CSSCore, ReactDOM.findDOMNode(this))\n );\n }\n this.classNameQueue.length = 0;\ndiff --git a\/src\/addons\/transitions\/__tests__\/ReactCSSTransitionGroup-test.js b\/src\/addons\/transitions\/__tests__\/ReactCSSTransitionGroup-test.js\nindex 2be2a33baf..a6b11d67af 100644\n--- a\/src\/addons\/transitions\/__tests__\/ReactCSSTransitionGroup-test.js\n+++ b\/src\/addons\/transitions\/__tests__\/ReactCSSTransitionGroup-test.js\n@@ -12,6 +12,7 @@\n 'use strict';\n \n var React;\n+var ReactDOM;\n var ReactCSSTransitionGroup;\n \n \/\/ Most of the real functionality is covered in other unit tests, this just\n@@ -21,6 +22,7 @@ describe('ReactCSSTransitionGroup', function() {\n \n beforeEach(function() {\n React = require('React');\n+ ReactDOM = require('ReactDOM');\n ReactCSSTransitionGroup = require('ReactCSSTransitionGroup');\n \n container = document.createElement('div');\n@@ -28,25 +30,25 @@ describe('ReactCSSTransitionGroup', function() {\n });\n \n it('should warn after time with no transitionend', function() {\n- var a = React.render(\n+ var a = ReactDOM.render(\n \n \n <\/ReactCSSTransitionGroup>,\n container\n );\n- expect(React.findDOMNode(a).childNodes.length).toBe(1);\n+ expect(ReactDOM.findDOMNode(a).childNodes.length).toBe(1);\n \n setTimeout.mock.calls.length = 0;\n \n- React.render(\n+ ReactDOM.render(\n \n \n <\/ReactCSSTransitionGroup>,\n container\n );\n- expect(React.findDOMNode(a).childNodes.length).toBe(2);\n- expect(React.findDOMNode(a).childNodes[0].id).toBe('two');\n- expect(React.findDOMNode(a).childNodes[1].id).toBe('one');\n+ expect(ReactDOM.findDOMNode(a).childNodes.length).toBe(2);\n+ expect(ReactDOM.findDOMNode(a).childNodes[0].id).toBe('two');\n+ expect(ReactDOM.findDOMNode(a).childNodes[1].id).toBe('one');\n \n \/\/ For some reason jst is adding extra setTimeout()s and grunt test isn't,\n \/\/ so we need to do this disgusting hack.\n@@ -57,31 +59,31 @@ describe('ReactCSSTransitionGroup', function() {\n }\n }\n \n- expect(React.findDOMNode(a).childNodes.length).toBe(2);\n+ expect(ReactDOM.findDOMNode(a).childNodes.length).toBe(2);\n expect(console.error.argsForCall.length).toBe(1);\n });\n \n it('should keep both sets of DOM nodes around', function() {\n- var a = React.render(\n+ var a = ReactDOM.render(\n \n \n <\/ReactCSSTransitionGroup>,\n container\n );\n- expect(React.findDOMNode(a).childNodes.length).toBe(1);\n- React.render(\n+ expect(ReactDOM.findDOMNode(a).childNodes.length).toBe(1);\n+ ReactDOM.render(\n \n \n <\/ReactCSSTransitionGroup>,\n container\n );\n- expect(React.findDOMNode(a).childNodes.length).toBe(2);\n- expect(React.findDOMNode(a).childNodes[0].id).toBe('two');\n- expect(React.findDOMNode(a).childNodes[1].id).toBe('one');\n+ expect(ReactDOM.findDOMNode(a).childNodes.length).toBe(2);\n+ expect(ReactDOM.findDOMNode(a).childNodes[0].id).toBe('two');\n+ expect(ReactDOM.findDOMNode(a).childNodes[1].id).toBe('one');\n });\n \n it('should switch transitionLeave from false to true', function() {\n- var a = React.render(\n+ var a = ReactDOM.render(\n ,\n container\n );\n- expect(React.findDOMNode(a).childNodes.length).toBe(1);\n- React.render(\n+ expect(ReactDOM.findDOMNode(a).childNodes.length).toBe(1);\n+ ReactDOM.render(\n ,\n container\n );\n- expect(React.findDOMNode(a).childNodes.length).toBe(1);\n- React.render(\n+ expect(ReactDOM.findDOMNode(a).childNodes.length).toBe(1);\n+ ReactDOM.render(\n ,\n container\n );\n- expect(React.findDOMNode(a).childNodes.length).toBe(2);\n- expect(React.findDOMNode(a).childNodes[0].id).toBe('three');\n- expect(React.findDOMNode(a).childNodes[1].id).toBe('two');\n+ expect(ReactDOM.findDOMNode(a).childNodes.length).toBe(2);\n+ expect(ReactDOM.findDOMNode(a).childNodes[0].id).toBe('three');\n+ expect(ReactDOM.findDOMNode(a).childNodes[1].id).toBe('two');\n });\n \n it('should work with no children', function() {\n- React.render(\n+ ReactDOM.render(\n ,\n container\n );\n });\n \n it('should work with a null child', function() {\n- React.render(\n+ ReactDOM.render(\n \n {[null]}\n <\/ReactCSSTransitionGroup>,\n@@ -132,14 +134,14 @@ describe('ReactCSSTransitionGroup', function() {\n });\n \n it('should transition from one to null', function() {\n- var a = React.render(\n+ var a = ReactDOM.render(\n \n \n <\/ReactCSSTransitionGroup>,\n container\n );\n- expect(React.findDOMNode(a).childNodes.length).toBe(1);\n- React.render(\n+ expect(ReactDOM.findDOMNode(a).childNodes.length).toBe(1);\n+ ReactDOM.render(\n \n {null}\n <\/ReactCSSTransitionGroup>,\n@@ -147,26 +149,26 @@ describe('ReactCSSTransitionGroup', function() {\n );\n \/\/ (Here, we expect the original child to stick around but test that no\n \/\/ exception is thrown)\n- expect(React.findDOMNode(a).childNodes.length).toBe(1);\n- expect(React.findDOMNode(a).childNodes[0].id).toBe('one');\n+ expect(ReactDOM.findDOMNode(a).childNodes.length).toBe(1);\n+ expect(ReactDOM.findDOMNode(a).childNodes[0].id).toBe('one');\n });\n \n it('should transition from false to one', function() {\n- var a = React.render(\n+ var a = ReactDOM.render(\n \n {false}\n <\/ReactCSSTransitionGroup>,\n container\n );\n- expect(React.findDOMNode(a).childNodes.length).toBe(0);\n- React.render(\n+ expect(ReactDOM.findDOMNode(a).childNodes.length).toBe(0);\n+ ReactDOM.render(\n \n \n <\/ReactCSSTransitionGroup>,\n container\n );\n- expect(React.findDOMNode(a).childNodes.length).toBe(1);\n- expect(React.findDOMNode(a).childNodes[0].id).toBe('one');\n+ expect(ReactDOM.findDOMNode(a).childNodes.length).toBe(1);\n+ expect(ReactDOM.findDOMNode(a).childNodes[0].id).toBe('one');\n });\n \n });\ndiff --git a\/src\/addons\/transitions\/__tests__\/ReactTransitionGroup-test.js b\/src\/addons\/transitions\/__tests__\/ReactTransitionGroup-test.js\nindex ed5cadbb52..7b294ce319 100644\n--- a\/src\/addons\/transitions\/__tests__\/ReactTransitionGroup-test.js\n+++ b\/src\/addons\/transitions\/__tests__\/ReactTransitionGroup-test.js\n@@ -12,6 +12,7 @@\n 'use strict';\n \n var React;\n+var ReactDOM;\n var ReactTransitionGroup;\n \n \/\/ Most of the real functionality is covered in other unit tests, this just\n@@ -21,6 +22,7 @@ describe('ReactTransitionGroup', function() {\n \n beforeEach(function() {\n React = require('React');\n+ ReactDOM = require('ReactDOM');\n ReactTransitionGroup = require('ReactTransitionGroup');\n \n container = document.createElement('div');\n@@ -76,7 +78,7 @@ describe('ReactTransitionGroup', function() {\n },\n });\n \n- var instance = React.render(, container);\n+ var instance = ReactDOM.render(, container);\n expect(log).toEqual(['didMount', 'willAppear', 'didAppear']);\n \n log = [];\n@@ -133,7 +135,7 @@ describe('ReactTransitionGroup', function() {\n },\n });\n \n- var instance = React.render(, container);\n+ var instance = ReactDOM.render(, container);\n expect(log).toEqual(['didMount']);\n instance.setState({count: 2});\n expect(log).toEqual(['didMount', 'didMount', 'willEnter']);\n@@ -193,7 +195,7 @@ describe('ReactTransitionGroup', function() {\n },\n });\n \n- var instance = React.render(, container);\n+ var instance = ReactDOM.render(, container);\n expect(log).toEqual(['didMount']);\n instance.setState({count: 2});\n expect(log).toEqual(['didMount', 'didMount', 'willEnter']);\n@@ -250,7 +252,7 @@ describe('ReactTransitionGroup', function() {\n },\n });\n \n- var instance = React.render(, container);\n+ var instance = ReactDOM.render(, container);\n expect(log).toEqual(['didMount0']);\n log = [];\n \ndiff --git a\/src\/isomorphic\/classic\/__tests__\/ReactContextValidator-test.js b\/src\/isomorphic\/classic\/__tests__\/ReactContextValidator-test.js\nindex 027c536826..0fa4fd5280 100644\n--- a\/src\/isomorphic\/classic\/__tests__\/ReactContextValidator-test.js\n+++ b\/src\/isomorphic\/classic\/__tests__\/ReactContextValidator-test.js\n@@ -18,6 +18,7 @@\n 'use strict';\n \n var React;\n+var ReactDOM;\n var ReactTestUtils;\n \n var reactComponentExpect;\n@@ -27,6 +28,7 @@ describe('ReactContextValidator', function() {\n require('mock-modules').dumpCache();\n \n React = require('React');\n+ ReactDOM = require('ReactDOM');\n ReactTestUtils = require('ReactTestUtils');\n reactComponentExpect = require('reactComponentExpect');\n \n@@ -122,8 +124,8 @@ describe('ReactContextValidator', function() {\n });\n \n var container = document.createElement('div');\n- React.render(, container);\n- React.render(, container);\n+ ReactDOM.render(, container);\n+ ReactDOM.render(, container);\n expect(actualComponentWillReceiveProps).toEqual({foo: 'def'});\n expect(actualShouldComponentUpdate).toEqual({foo: 'def'});\n expect(actualComponentWillUpdate).toEqual({foo: 'def'});\ndiff --git a\/src\/isomorphic\/classic\/class\/__tests__\/ReactClass-test.js b\/src\/isomorphic\/classic\/class\/__tests__\/ReactClass-test.js\nindex bf73ffdfdd..51f8a11718 100644\n--- a\/src\/isomorphic\/classic\/class\/__tests__\/ReactClass-test.js\n+++ b\/src\/isomorphic\/classic\/class\/__tests__\/ReactClass-test.js\n@@ -14,12 +14,14 @@\n var mocks = require('mocks');\n \n var React;\n+var ReactDOM;\n var ReactTestUtils;\n \n describe('ReactClass-spec', function() {\n \n beforeEach(function() {\n React = require('React');\n+ ReactDOM = require('ReactDOM');\n ReactTestUtils = require('ReactTestUtils');\n spyOn(console, 'error');\n });\n@@ -311,7 +313,7 @@ describe('ReactClass-spec', function() {\n });\n \n var container = document.createElement('div');\n- React.render(, container);\n+ ReactDOM.render(, container);\n expect(container.firstChild.className).toBe('foo');\n });\n \n@@ -372,7 +374,7 @@ describe('ReactClass-spec', function() {\n });\n \n var container = document.createElement('div');\n- var instance = React.render(, container);\n+ var instance = ReactDOM.render(, container);\n \n instance.getDOMNode();\n \ndiff --git a\/src\/isomorphic\/classic\/element\/__tests__\/ReactElement-test.js b\/src\/isomorphic\/classic\/element\/__tests__\/ReactElement-test.js\nindex 1e715e1f45..433e4c8021 100644\n--- a\/src\/isomorphic\/classic\/element\/__tests__\/ReactElement-test.js\n+++ b\/src\/isomorphic\/classic\/element\/__tests__\/ReactElement-test.js\n@@ -15,6 +15,7 @@\n \/\/ classic JS without JSX.\n \n var React;\n+var ReactDOM;\n var ReactTestUtils;\n \n describe('ReactElement', function() {\n@@ -24,6 +25,7 @@ describe('ReactElement', function() {\n require('mock-modules').dumpCache();\n \n React = require('React');\n+ ReactDOM = require('ReactDOM');\n ReactTestUtils = require('ReactTestUtils');\n ComponentClass = React.createClass({\n render: function() {\n@@ -220,13 +222,13 @@ describe('ReactElement', function() {\n });\n \n var container = document.createElement('div');\n- var instance = React.render(\n+ var instance = ReactDOM.render(\n React.createElement(Component, {fruit: 'mango'}),\n container\n );\n expect(instance.props.fruit).toBe('mango');\n \n- React.render(React.createElement(Component), container);\n+ ReactDOM.render(React.createElement(Component), container);\n expect(instance.props.fruit).toBe('persimmon');\n });\n \n@@ -265,7 +267,7 @@ describe('ReactElement', function() {\n },\n });\n var outer = ReactTestUtils.renderIntoDocument();\n- expect(React.findDOMNode(outer).className).toBe('moo');\n+ expect(ReactDOM.findDOMNode(outer).className).toBe('moo');\n });\n \n it('throws when adding a prop (in dev) after element creation', function() {\n@@ -284,9 +286,9 @@ describe('ReactElement', function() {\n return el;\n },\n });\n- var outer = React.render(, container);\n- expect(React.findDOMNode(outer).textContent).toBe('meow');\n- expect(React.findDOMNode(outer).className).toBe('');\n+ var outer = ReactDOM.render(, container);\n+ expect(ReactDOM.findDOMNode(outer).textContent).toBe('meow');\n+ expect(ReactDOM.findDOMNode(outer).className).toBe('');\n });\n \n it('does not warn for NaN props', function() {\ndiff --git a\/src\/isomorphic\/classic\/element\/__tests__\/ReactElementClone-test.js b\/src\/isomorphic\/classic\/element\/__tests__\/ReactElementClone-test.js\nindex ffe68c81c6..9a6774409b 100644\n--- a\/src\/isomorphic\/classic\/element\/__tests__\/ReactElementClone-test.js\n+++ b\/src\/isomorphic\/classic\/element\/__tests__\/ReactElementClone-test.js\n@@ -14,12 +14,14 @@\n require('mock-modules');\n \n var React;\n+var ReactDOM;\n var ReactTestUtils;\n \n describe('ReactElementClone', function() {\n \n beforeEach(function() {\n React = require('React');\n+ ReactDOM = require('ReactDOM');\n ReactTestUtils = require('ReactTestUtils');\n });\n \n@@ -39,7 +41,7 @@ describe('ReactElementClone', function() {\n },\n });\n var component = ReactTestUtils.renderIntoDocument();\n- expect(React.findDOMNode(component).childNodes[0].className).toBe('xyz');\n+ expect(ReactDOM.findDOMNode(component).childNodes[0].className).toBe('xyz');\n });\n \n it('should clone a composite component with new props', function() {\n@@ -63,7 +65,7 @@ describe('ReactElementClone', function() {\n },\n });\n var component = ReactTestUtils.renderIntoDocument();\n- expect(React.findDOMNode(component).childNodes[0].className).toBe('xyz');\n+ expect(ReactDOM.findDOMNode(component).childNodes[0].className).toBe('xyz');\n });\n \n it('should keep the original ref if it is not overridden', function() {\ndiff --git a\/src\/isomorphic\/classic\/element\/__tests__\/ReactElementValidator-test.js b\/src\/isomorphic\/classic\/element\/__tests__\/ReactElementValidator-test.js\nindex fe3d1159cc..542ca021ea 100644\n--- a\/src\/isomorphic\/classic\/element\/__tests__\/ReactElementValidator-test.js\n+++ b\/src\/isomorphic\/classic\/element\/__tests__\/ReactElementValidator-test.js\n@@ -15,6 +15,7 @@\n \/\/ classic JS without JSX.\n \n var React;\n+var ReactDOM;\n var ReactFragment;\n var ReactTestUtils;\n \n@@ -25,6 +26,7 @@ describe('ReactElementValidator', function() {\n require('mock-modules').dumpCache();\n \n React = require('React');\n+ ReactDOM = require('ReactDOM');\n ReactFragment = require('ReactFragment');\n ReactTestUtils = require('ReactTestUtils');\n ComponentClass = React.createClass({\n@@ -486,7 +488,7 @@ describe('ReactElementValidator', function() {\n return

;\n },\n componentDidMount: function() {\n- React.findDOMNode(this).appendChild(this.props.children);\n+ ReactDOM.findDOMNode(this).appendChild(this.props.children);\n },\n });\n \ndiff --git a\/src\/isomorphic\/deprecated\/__tests__\/cloneWithProps-test.js b\/src\/isomorphic\/deprecated\/__tests__\/cloneWithProps-test.js\nindex b8c4343bb2..dedc4bf1b7 100644\n--- a\/src\/isomorphic\/deprecated\/__tests__\/cloneWithProps-test.js\n+++ b\/src\/isomorphic\/deprecated\/__tests__\/cloneWithProps-test.js\n@@ -12,6 +12,7 @@\n 'use strict';\n \n var React;\n+var ReactDOM;\n var ReactTestUtils;\n \n var onlyChild;\n@@ -23,6 +24,7 @@ describe('cloneWithProps', function() {\n beforeEach(function() {\n require('mock-modules').dumpCache();\n React = require('React');\n+ ReactDOM = require('ReactDOM');\n ReactTestUtils = require('ReactTestUtils');\n onlyChild = require('onlyChild');\n cloneWithProps = require('cloneWithProps');\n@@ -65,7 +67,7 @@ describe('cloneWithProps', function() {\n },\n });\n var component = ReactTestUtils.renderIntoDocument();\n- expect(React.findDOMNode(component).childNodes[0].className)\n+ expect(ReactDOM.findDOMNode(component).childNodes[0].className)\n .toBe('xyz child');\n });\n \n@@ -92,7 +94,7 @@ describe('cloneWithProps', function() {\n },\n });\n var component = ReactTestUtils.renderIntoDocument();\n- expect(React.findDOMNode(component).childNodes[0].className)\n+ expect(ReactDOM.findDOMNode(component).childNodes[0].className)\n .toBe('xyz child');\n });\n \ndiff --git a\/src\/isomorphic\/modern\/class\/__tests__\/ReactES6Class-test.js b\/src\/isomorphic\/modern\/class\/__tests__\/ReactES6Class-test.js\nindex 0530c5bfb4..d968eb008d 100644\n--- a\/src\/isomorphic\/modern\/class\/__tests__\/ReactES6Class-test.js\n+++ b\/src\/isomorphic\/modern\/class\/__tests__\/ReactES6Class-test.js\n@@ -12,6 +12,7 @@\n 'use strict';\n \n var React;\n+var ReactDOM;\n \n describe('ReactES6Class', function() {\n \n@@ -26,6 +27,7 @@ describe('ReactES6Class', function() {\n \n beforeEach(function() {\n React = require('React');\n+ ReactDOM = require('ReactDOM');\n container = document.createElement('div');\n attachedListener = null;\n renderedName = null;\n@@ -42,7 +44,7 @@ describe('ReactES6Class', function() {\n });\n \n function test(element, expectedTag, expectedClassName) {\n- var instance = React.render(element, container);\n+ var instance = ReactDOM.render(element, container);\n expect(container.firstChild).not.toBeNull();\n expect(container.firstChild.tagName).toBe(expectedTag);\n expect(container.firstChild.className).toBe(expectedClassName);\n@@ -57,7 +59,7 @@ describe('ReactES6Class', function() {\n it('throws if no render function is defined', function() {\n spyOn(console, 'error');\n class Foo extends React.Component { }\n- expect(() => React.render(, container)).toThrow();\n+ expect(() => ReactDOM.render(, container)).toThrow();\n \n expect(console.error.calls.length).toBe(1);\n expect(console.error.calls[0].args[0]).toBe(\n@@ -308,7 +310,7 @@ describe('ReactES6Class', function() {\n 'did-update', freeze({value: 'foo'}), {},\n ]);\n lifeCycles = []; \/\/ reset\n- React.unmountComponentAtNode(container);\n+ ReactDOM.unmountComponentAtNode(container);\n expect(lifeCycles).toEqual([\n 'will-unmount',\n ]);\n@@ -456,7 +458,7 @@ describe('ReactES6Class', function() {\n \n it('supports drilling through to the DOM using findDOMNode', function() {\n var instance = test(, 'DIV', 'foo');\n- var node = React.findDOMNode(instance);\n+ var node = ReactDOM.findDOMNode(instance);\n expect(node).toBe(container.firstChild);\n });\n \ndiff --git a\/src\/isomorphic\/modern\/element\/__tests__\/ReactJSXElement-test.js b\/src\/isomorphic\/modern\/element\/__tests__\/ReactJSXElement-test.js\nindex caf4e7f923..ab7a105f37 100644\n--- a\/src\/isomorphic\/modern\/element\/__tests__\/ReactJSXElement-test.js\n+++ b\/src\/isomorphic\/modern\/element\/__tests__\/ReactJSXElement-test.js\n@@ -12,6 +12,7 @@\n 'use strict';\n \n var React;\n+var ReactDOM;\n var ReactTestUtils;\n \n describe('ReactJSXElement', function() {\n@@ -21,6 +22,7 @@ describe('ReactJSXElement', function() {\n require('mock-modules').dumpCache();\n \n React = require('React');\n+ ReactDOM = require('ReactDOM');\n ReactTestUtils = require('ReactTestUtils');\n Component = class {\n render() {\n@@ -161,13 +163,13 @@ describe('ReactJSXElement', function() {\n Component.defaultProps = {fruit: 'persimmon'};\n \n var container = document.createElement('div');\n- var instance = React.render(\n+ var instance = ReactDOM.render(\n ,\n container\n );\n expect(instance.props.fruit).toBe('mango');\n \n- React.render(, container);\n+ ReactDOM.render(, container);\n expect(instance.props.fruit).toBe('persimmon');\n });\n \ndiff --git a\/src\/renderers\/dom\/client\/__tests__\/ReactDOM-test.js b\/src\/renderers\/dom\/client\/__tests__\/ReactDOM-test.js\nindex 84fdccb99e..cf88616e8c 100644\n--- a\/src\/renderers\/dom\/client\/__tests__\/ReactDOM-test.js\n+++ b\/src\/renderers\/dom\/client\/__tests__\/ReactDOM-test.js\n@@ -12,6 +12,7 @@\n 'use strict';\n \n var React = require('React');\n+var ReactDOM = require('ReactDOM');\n var ReactTestUtils = require('ReactTestUtils');\n var div = React.createFactory('div');\n \n@@ -48,14 +49,14 @@ describe('ReactDOM', function() {\n it('allows a DOM element to be used with a string', function() {\n var element = React.createElement('div', {className: 'foo'});\n var instance = ReactTestUtils.renderIntoDocument(element);\n- expect(React.findDOMNode(instance).tagName).toBe('DIV');\n+ expect(ReactDOM.findDOMNode(instance).tagName).toBe('DIV');\n });\n \n it('should allow children to be passed as an argument', function() {\n var argDiv = ReactTestUtils.renderIntoDocument(\n div(null, 'child')\n );\n- var argNode = React.findDOMNode(argDiv);\n+ var argNode = ReactDOM.findDOMNode(argDiv);\n expect(argNode.innerHTML).toBe('child');\n });\n \n@@ -63,7 +64,7 @@ describe('ReactDOM', function() {\n var conflictDiv = ReactTestUtils.renderIntoDocument(\n div({children: 'fakechild'}, 'child')\n );\n- var conflictNode = React.findDOMNode(conflictDiv);\n+ var conflictNode = ReactDOM.findDOMNode(conflictDiv);\n expect(conflictNode.innerHTML).toBe('child');\n });\n \n@@ -105,7 +106,7 @@ describe('ReactDOM', function() {\n

,\n <\/div>\n );\n- var root = React.findDOMNode(myDiv);\n+ var root = ReactDOM.findDOMNode(myDiv);\n var dog = root.childNodes[0];\n expect(dog.className).toBe('bigdog');\n });\ndiff --git a\/src\/renderers\/dom\/client\/__tests__\/ReactDOMSVG-test.js b\/src\/renderers\/dom\/client\/__tests__\/ReactDOMSVG-test.js\nindex 55d59330ac..2898d2c2e4 100644\n--- a\/src\/renderers\/dom\/client\/__tests__\/ReactDOMSVG-test.js\n+++ b\/src\/renderers\/dom\/client\/__tests__\/ReactDOMSVG-test.js\n@@ -12,15 +12,17 @@\n 'use strict';\n \n var React;\n+var ReactDOMServer;\n \n describe('ReactDOMSVG', function() {\n \n beforeEach(function() {\n React = require('React');\n+ ReactDOMServer = require('ReactDOMServer');\n });\n \n it('creates initial namespaced markup', function() {\n- var markup = React.renderToString(\n+ var markup = ReactDOMServer.renderToString(\n

Parent<\/div>,\n parentContainer\n );\n- React.findDOMNode(parentControl).appendChild(childContainer);\n+ ReactDOM.findDOMNode(parentControl).appendChild(childContainer);\n \n \/\/ Suppose an event handler in each root enqueues an update to the\n \/\/ childControl element -- the two updates should get batched together.\n- var childNode = React.findDOMNode(childControl);\n+ var childNode = ReactDOM.findDOMNode(childControl);\n handleTopLevel.mockImplementation(\n function(topLevelType, topLevelTarget, topLevelTargetID, nativeEvent) {\n ReactMount.render(\n@@ -202,12 +206,12 @@ describe('ReactEventListener', function() {\n \n var callback = ReactEventListener.dispatchEvent.bind(null, 'test');\n callback({\n- target: React.findDOMNode(instance.getInner()),\n+ target: ReactDOM.findDOMNode(instance.getInner()),\n });\n \n var calls = handleTopLevel.mock.calls;\n expect(calls.length).toBe(1);\n expect(calls[0][EVENT_TARGET_PARAM])\n- .toBe(React.findDOMNode(instance.getInner()));\n+ .toBe(ReactDOM.findDOMNode(instance.getInner()));\n });\n });\ndiff --git a\/src\/renderers\/dom\/client\/__tests__\/ReactMount-test.js b\/src\/renderers\/dom\/client\/__tests__\/ReactMount-test.js\nindex efbd115432..66ff96e686 100644\n--- a\/src\/renderers\/dom\/client\/__tests__\/ReactMount-test.js\n+++ b\/src\/renderers\/dom\/client\/__tests__\/ReactMount-test.js\n@@ -15,6 +15,8 @@ var mocks = require('mocks');\n \n describe('ReactMount', function() {\n var React = require('React');\n+ var ReactDOM = require('ReactDOM');\n+ var ReactDOMServer = require('ReactDOMServer');\n var ReactMount = require('ReactMount');\n var ReactTestUtils = require('ReactTestUtils');\n var WebComponents = WebComponents;\n@@ -33,7 +35,7 @@ describe('ReactMount', function() {\n it('throws when given a non-node', function() {\n var nodeArray = document.getElementsByTagName('div');\n expect(function() {\n- React.unmountComponentAtNode(nodeArray);\n+ ReactDOM.unmountComponentAtNode(nodeArray);\n }).toThrow(\n 'Invariant Violation: unmountComponentAtNode(...): Target container ' +\n 'is not a DOM element.'\n@@ -114,21 +116,21 @@ describe('ReactMount', function() {\n \n it('should reuse markup if rendering to the same target twice', function() {\n var container = document.createElement('container');\n- var instance1 = React.render(

, container);\n- var instance2 = React.render(

, container);\n+ var instance1 = ReactDOM.render(

, container);\n+ var instance2 = ReactDOM.render(

, container);\n \n expect(instance1 === instance2).toBe(true);\n });\n \n it('should warn if mounting into dirty rendered markup', function() {\n var container = document.createElement('container');\n- container.innerHTML = React.renderToString(

) + ' ';\n+ container.innerHTML = ReactDOMServer.renderToString(

) + ' ';\n \n spyOn(console, 'error');\n ReactMount.render(

, container);\n expect(console.error.calls.length).toBe(1);\n \n- container.innerHTML = ' ' + React.renderToString(

);\n+ container.innerHTML = ' ' + ReactDOMServer.renderToString(

);\n \n ReactMount.render(

, container);\n expect(console.error.calls.length).toBe(2);\n@@ -158,12 +160,12 @@ describe('ReactMount', function() {\n \n it('should account for escaping on a checksum mismatch', function () {\n var div = document.createElement('div');\n- var markup = React.renderToString(\n+ var markup = ReactDOMServer.renderToString(\n

This markup contains an nbsp entity: server text<\/div>);\n div.innerHTML = markup;\n \n spyOn(console, 'error');\n- React.render(\n+ ReactDOM.render(\n

This markup contains an nbsp entity: client text<\/div>,\n div\n );\n@@ -182,15 +184,15 @@ describe('ReactMount', function() {\n createdCallback: {\n value: function() {\n shadowRoot = this.createShadowRoot();\n- React.render(

Hi, from within a WC!<\/div>, shadowRoot);\n+ ReactDOM.render(

Hi, from within a WC!<\/div>, shadowRoot);\n expect(shadowRoot.firstChild.tagName).toBe('DIV');\n- React.render(Hi, from within a WC!<\/span>, shadowRoot);\n+ ReactDOM.render(Hi, from within a WC!<\/span>, shadowRoot);\n expect(shadowRoot.firstChild.tagName).toBe('SPAN');\n },\n },\n });\n proto.unmount = function() {\n- React.unmountComponentAtNode(shadowRoot);\n+ ReactDOM.unmountComponentAtNode(shadowRoot);\n };\n document.registerElement('x-foo', {prototype: proto});\n var element = document.createElement('x-foo');\ndiff --git a\/src\/renderers\/dom\/client\/__tests__\/ReactMountDestruction-test.js b\/src\/renderers\/dom\/client\/__tests__\/ReactMountDestruction-test.js\nindex d13071f547..6dbc1b6985 100644\n--- a\/src\/renderers\/dom\/client\/__tests__\/ReactMountDestruction-test.js\n+++ b\/src\/renderers\/dom\/client\/__tests__\/ReactMountDestruction-test.js\n@@ -12,6 +12,7 @@\n 'use strict';\n \n var React = require('React');\n+var ReactDOM = require('ReactDOM');\n \n describe('ReactMount', function() {\n it('should destroy a react root upon request', function() {\n@@ -24,7 +25,7 @@ describe('ReactMount', function() {\n );\n var firstRootDiv = document.createElement('div');\n mainContainerDiv.appendChild(firstRootDiv);\n- React.render(instanceOne, firstRootDiv);\n+ ReactDOM.render(instanceOne, firstRootDiv);\n \n var instanceTwo = (\n

\n@@ -32,16 +33,16 @@ describe('ReactMount', function() {\n );\n var secondRootDiv = document.createElement('div');\n mainContainerDiv.appendChild(secondRootDiv);\n- React.render(instanceTwo, secondRootDiv);\n+ ReactDOM.render(instanceTwo, secondRootDiv);\n \n \/\/ Test that two react roots are rendered in isolation\n expect(firstRootDiv.firstChild.className).toBe('firstReactDiv');\n expect(secondRootDiv.firstChild.className).toBe('secondReactDiv');\n \n \/\/ Test that after unmounting each, they are no longer in the document.\n- React.unmountComponentAtNode(firstRootDiv);\n+ ReactDOM.unmountComponentAtNode(firstRootDiv);\n expect(firstRootDiv.firstChild).toBeNull();\n- React.unmountComponentAtNode(secondRootDiv);\n+ ReactDOM.unmountComponentAtNode(secondRootDiv);\n expect(secondRootDiv.firstChild).toBeNull();\n });\n });\ndiff --git a\/src\/renderers\/dom\/client\/__tests__\/ReactRenderDocument-test.js b\/src\/renderers\/dom\/client\/__tests__\/ReactRenderDocument-test.js\nindex 667f73d46d..e2748f20c3 100644\n--- a\/src\/renderers\/dom\/client\/__tests__\/ReactRenderDocument-test.js\n+++ b\/src\/renderers\/dom\/client\/__tests__\/ReactRenderDocument-test.js\n@@ -12,6 +12,8 @@\n 'use strict';\n \n var React;\n+var ReactDOM;\n+var ReactDOMServer;\n var ReactInstanceMap;\n var ReactMount;\n \n@@ -31,6 +33,8 @@ describe('rendering React components at document', function() {\n require('mock-modules').dumpCache();\n \n React = require('React');\n+ ReactDOM = require('ReactDOM');\n+ ReactDOMServer = require('ReactDOMServer');\n ReactInstanceMap = require('ReactInstanceMap');\n ReactMount = require('ReactMount');\n getTestDocument = require('getTestDocument');\n@@ -56,9 +60,9 @@ describe('rendering React components at document', function() {\n },\n });\n \n- var markup = React.renderToString();\n+ var markup = ReactDOMServer.renderToString();\n testDocument = getTestDocument(markup);\n- var component = React.render(, testDocument);\n+ var component = ReactDOM.render(, testDocument);\n expect(testDocument.body.innerHTML).toBe('Hello world');\n \n \/\/ TODO: This is a bad test. I have no idea what this is testing.\n@@ -85,13 +89,13 @@ describe('rendering React components at document', function() {\n },\n });\n \n- var markup = React.renderToString();\n+ var markup = ReactDOMServer.renderToString();\n testDocument = getTestDocument(markup);\n- React.render(, testDocument);\n+ ReactDOM.render(, testDocument);\n expect(testDocument.body.innerHTML).toBe('Hello world');\n \n expect(function() {\n- React.unmountComponentAtNode(testDocument);\n+ ReactDOM.unmountComponentAtNode(testDocument);\n }).toThrow(UNMOUNT_INVARIANT_MESSAGE);\n \n expect(testDocument.body.innerHTML).toBe('Hello world');\n@@ -130,16 +134,16 @@ describe('rendering React components at document', function() {\n },\n });\n \n- var markup = React.renderToString();\n+ var markup = ReactDOMServer.renderToString();\n testDocument = getTestDocument(markup);\n \n- React.render(, testDocument);\n+ ReactDOM.render(, testDocument);\n \n expect(testDocument.body.innerHTML).toBe('Hello world');\n \n \/\/ Reactive update\n expect(function() {\n- React.render(, testDocument);\n+ ReactDOM.render(, testDocument);\n }).toThrow(UNMOUNT_INVARIANT_MESSAGE);\n \n expect(testDocument.body.innerHTML).toBe('Hello world');\n@@ -163,12 +167,12 @@ describe('rendering React components at document', function() {\n },\n });\n \n- var markup = React.renderToString(\n+ var markup = ReactDOMServer.renderToString(\n \n );\n testDocument = getTestDocument(markup);\n \n- React.render(, testDocument);\n+ ReactDOM.render(, testDocument);\n \n expect(testDocument.body.innerHTML).toBe('Hello world');\n });\n@@ -191,14 +195,14 @@ describe('rendering React components at document', function() {\n },\n });\n \n- var markup = React.renderToString(\n+ var markup = ReactDOMServer.renderToString(\n \n );\n testDocument = getTestDocument(markup);\n \n expect(function() {\n \/\/ Notice the text is different!\n- React.render(, testDocument);\n+ ReactDOM.render(, testDocument);\n }).toThrow(\n 'Invariant Violation: ' +\n 'You\\'re trying to render a component to the document using ' +\n@@ -235,7 +239,7 @@ describe('rendering React components at document', function() {\n });\n \n expect(function() {\n- React.render(, container);\n+ ReactDOM.render(, container);\n }).toThrow(\n 'Invariant Violation: You\\'re trying to render a component to the ' +\n 'document but you didn\\'t use server rendering. We can\\'t do this ' +\n@@ -255,10 +259,10 @@ describe('rendering React components at document', function() {\n <\/body>\n <\/html>;\n \n- var markup = React.renderToString(tree);\n+ var markup = ReactDOMServer.renderToString(tree);\n testDocument = getTestDocument(markup);\n- var component = React.render(tree, testDocument);\n+ var component = ReactDOM.render(tree, testDocument);\n expect(testDocument.body.innerHTML).toBe('Hello world');\n- expect(React.findDOMNode(component).tagName).toBe('HTML');\n+ expect(ReactDOM.findDOMNode(component).tagName).toBe('HTML');\n });\n });\ndiff --git a\/src\/renderers\/dom\/client\/__tests__\/findDOMNode-test.js b\/src\/renderers\/dom\/client\/__tests__\/findDOMNode-test.js\nindex 8f213caac7..4e3e5e988b 100644\n--- a\/src\/renderers\/dom\/client\/__tests__\/findDOMNode-test.js\n+++ b\/src\/renderers\/dom\/client\/__tests__\/findDOMNode-test.js\n@@ -12,11 +12,12 @@\n 'use strict';\n \n var React = require('React');\n+var ReactDOM = require('ReactDOM');\n var ReactTestUtils = require('ReactTestUtils');\n \n describe('findDOMNode', function() {\n it('findDOMNode should return null if passed null', function() {\n- expect(React.findDOMNode(null)).toBe(null);\n+ expect(ReactDOM.findDOMNode(null)).toBe(null);\n });\n \n it('findDOMNode should find dom element', function() {\n@@ -27,15 +28,15 @@ describe('findDOMNode', function() {\n });\n \n var myNode = ReactTestUtils.renderIntoDocument();\n- var myDiv = React.findDOMNode(myNode);\n- var mySameDiv = React.findDOMNode(myDiv);\n+ var myDiv = ReactDOM.findDOMNode(myNode);\n+ var mySameDiv = ReactDOM.findDOMNode(myDiv);\n expect(myDiv.tagName).toBe('DIV');\n expect(mySameDiv).toBe(myDiv);\n });\n \n it('findDOMNode should reject random objects', function() {\n expect(function() {\n- React.findDOMNode({foo: 'bar'});\n+ ReactDOM.findDOMNode({foo: 'bar'});\n })\n .toThrow('Invariant Violation: Element appears to be neither ' +\n 'ReactComponent nor DOMNode (keys: foo)'\n@@ -44,7 +45,7 @@ describe('findDOMNode', function() {\n \n it('findDOMNode should reject unmounted objects with render func', function() {\n expect(function() {\n- React.findDOMNode({render: function() {}});\n+ ReactDOM.findDOMNode({render: function() {}});\n })\n .toThrow('Invariant Violation: Component (with keys: render) ' +\n 'contains `render` method but is not mounted in the DOM'\ndiff --git a\/src\/renderers\/dom\/client\/eventPlugins\/__tests__\/EnterLeaveEventPlugin-test.js b\/src\/renderers\/dom\/client\/eventPlugins\/__tests__\/EnterLeaveEventPlugin-test.js\nindex bae68b94f0..4040b3beb2 100644\n--- a\/src\/renderers\/dom\/client\/eventPlugins\/__tests__\/EnterLeaveEventPlugin-test.js\n+++ b\/src\/renderers\/dom\/client\/eventPlugins\/__tests__\/EnterLeaveEventPlugin-test.js\n@@ -14,6 +14,7 @@\n var EnterLeaveEventPlugin;\n var EventConstants;\n var React;\n+var ReactDOM;\n var ReactMount;\n \n var topLevelTypes;\n@@ -25,6 +26,7 @@ describe('EnterLeaveEventPlugin', function() {\n EnterLeaveEventPlugin = require('EnterLeaveEventPlugin');\n EventConstants = require('EventConstants');\n React = require('React');\n+ ReactDOM = require('ReactDOM');\n ReactMount = require('ReactMount');\n \n topLevelTypes = EventConstants.topLevelTypes;\n@@ -41,8 +43,8 @@ describe('EnterLeaveEventPlugin', function() {\n );\n iframeDocument.close();\n \n- var component = React.render(

, iframeDocument.body.getElementsByTagName('div')[0]);\n- var div = React.findDOMNode(component);\n+ var component = ReactDOM.render(

, iframeDocument.body.getElementsByTagName('div')[0]);\n+ var div = ReactDOM.findDOMNode(component);\n \n var extracted = EnterLeaveEventPlugin.extractEvents(\n topLevelTypes.topMouseOver,\ndiff --git a\/src\/renderers\/dom\/client\/eventPlugins\/__tests__\/SelectEventPlugin-test.js b\/src\/renderers\/dom\/client\/eventPlugins\/__tests__\/SelectEventPlugin-test.js\nindex 1ca9c9bacf..8a536c13fb 100644\n--- a\/src\/renderers\/dom\/client\/eventPlugins\/__tests__\/SelectEventPlugin-test.js\n+++ b\/src\/renderers\/dom\/client\/eventPlugins\/__tests__\/SelectEventPlugin-test.js\n@@ -13,6 +13,7 @@\n \n var EventConstants;\n var React;\n+var ReactDOM;\n var ReactMount;\n var ReactTestUtils;\n var SelectEventPlugin;\n@@ -33,6 +34,7 @@ describe('SelectEventPlugin', function() {\n beforeEach(function() {\n EventConstants = require('EventConstants');\n React = require('React');\n+ ReactDOM = require('ReactDOM');\n ReactMount = require('ReactMount');\n ReactTestUtils = require('ReactTestUtils');\n SelectEventPlugin = require('SelectEventPlugin');\n@@ -48,7 +50,7 @@ describe('SelectEventPlugin', function() {\n });\n \n var rendered = ReactTestUtils.renderIntoDocument();\n- var node = React.findDOMNode(rendered);\n+ var node = ReactDOM.findDOMNode(rendered);\n node.focus();\n \n var mousedown = extract(node, topLevelTypes.topMouseDown);\n@@ -72,7 +74,7 @@ describe('SelectEventPlugin', function() {\n var rendered = ReactTestUtils.renderIntoDocument(\n \n );\n- var node = React.findDOMNode(rendered);\n+ var node = ReactDOM.findDOMNode(rendered);\n \n node.selectionStart = 0;\n node.selectionEnd = 0;\ndiff --git a\/src\/renderers\/dom\/client\/wrappers\/__tests__\/ReactDOMButton-test.js b\/src\/renderers\/dom\/client\/wrappers\/__tests__\/ReactDOMButton-test.js\nindex 757b8cd97f..f536d93c70 100644\n--- a\/src\/renderers\/dom\/client\/wrappers\/__tests__\/ReactDOMButton-test.js\n+++ b\/src\/renderers\/dom\/client\/wrappers\/__tests__\/ReactDOMButton-test.js\n@@ -16,19 +16,20 @@ var mocks = require('mocks');\n \n describe('ReactDOMButton', function() {\n var React;\n+ var ReactDOM;\n var ReactTestUtils;\n \n var onClick = mocks.getMockFunction();\n \n function expectClickThru(button) {\n onClick.mockClear();\n- ReactTestUtils.Simulate.click(React.findDOMNode(button));\n+ ReactTestUtils.Simulate.click(ReactDOM.findDOMNode(button));\n expect(onClick.mock.calls.length).toBe(1);\n }\n \n function expectNoClickThru(button) {\n onClick.mockClear();\n- ReactTestUtils.Simulate.click(React.findDOMNode(button));\n+ ReactTestUtils.Simulate.click(ReactDOM.findDOMNode(button));\n expect(onClick.mock.calls.length).toBe(0);\n }\n \n@@ -39,6 +40,7 @@ describe('ReactDOMButton', function() {\n \n beforeEach(function() {\n React = require('React');\n+ ReactDOM = require('ReactDOM');\n ReactTestUtils = require('ReactTestUtils');\n });\n \n@@ -54,11 +56,11 @@ describe('ReactDOMButton', function() {\n \n it('should forward clicks when it becomes not disabled', function() {\n var container = document.createElement('div');\n- var btn = React.render(\n+ var btn = ReactDOM.render(\n

dillon1000/react

Files changed