,
container
);
- expect(React.findDOMNode(a).childNodes.length).toBe(2);
- expect(React.findDOMNode(a).childNodes[0].id).toBe('three');
- expect(React.findDOMNode(a).childNodes[1].id).toBe('two');
+ expect(ReactDOM.findDOMNode(a).childNodes.length).toBe(2);
+ expect(ReactDOM.findDOMNode(a).childNodes[0].id).toBe('three');
+ expect(ReactDOM.findDOMNode(a).childNodes[1].id).toBe('two');
});
it('should work with no children', function() {
- React.render(
+ ReactDOM.render(
,
container
);
});
it('should work with a null child', function() {
- React.render(
+ ReactDOM.render(
{[null]}
,
@@ -132,14 +134,14 @@ describe('ReactCSSTransitionGroup', function() {
});
it('should transition from one to null', function() {
- var a = React.render(
+ var a = ReactDOM.render(
,
container
);
- expect(React.findDOMNode(a).childNodes.length).toBe(1);
- React.render(
+ expect(ReactDOM.findDOMNode(a).childNodes.length).toBe(1);
+ ReactDOM.render(
{null}
,
@@ -147,26 +149,26 @@ describe('ReactCSSTransitionGroup', function() {
);
// (Here, we expect the original child to stick around but test that no
// exception is thrown)
- expect(React.findDOMNode(a).childNodes.length).toBe(1);
- expect(React.findDOMNode(a).childNodes[0].id).toBe('one');
+ expect(ReactDOM.findDOMNode(a).childNodes.length).toBe(1);
+ expect(ReactDOM.findDOMNode(a).childNodes[0].id).toBe('one');
});
it('should transition from false to one', function() {
- var a = React.render(
+ var a = ReactDOM.render(
{false}
,
container
);
- expect(React.findDOMNode(a).childNodes.length).toBe(0);
- React.render(
+ expect(ReactDOM.findDOMNode(a).childNodes.length).toBe(0);
+ ReactDOM.render(
,
container
);
- expect(React.findDOMNode(a).childNodes.length).toBe(1);
- expect(React.findDOMNode(a).childNodes[0].id).toBe('one');
+ expect(ReactDOM.findDOMNode(a).childNodes.length).toBe(1);
+ expect(ReactDOM.findDOMNode(a).childNodes[0].id).toBe('one');
});
});
diff --git a/src/addons/transitions/__tests__/ReactTransitionGroup-test.js b/src/addons/transitions/__tests__/ReactTransitionGroup-test.js
index ed5cadbb52..7b294ce319 100644
--- a/src/addons/transitions/__tests__/ReactTransitionGroup-test.js
+++ b/src/addons/transitions/__tests__/ReactTransitionGroup-test.js
@@ -12,6 +12,7 @@
'use strict';
var React;
+var ReactDOM;
var ReactTransitionGroup;
// Most of the real functionality is covered in other unit tests, this just
@@ -21,6 +22,7 @@ describe('ReactTransitionGroup', function() {
beforeEach(function() {
React = require('React');
+ ReactDOM = require('ReactDOM');
ReactTransitionGroup = require('ReactTransitionGroup');
container = document.createElement('div');
@@ -76,7 +78,7 @@ describe('ReactTransitionGroup', function() {
},
});
- var instance = React.render(, container);
+ var instance = ReactDOM.render(, container);
expect(log).toEqual(['didMount', 'willAppear', 'didAppear']);
log = [];
@@ -133,7 +135,7 @@ describe('ReactTransitionGroup', function() {
},
});
- var instance = React.render(, container);
+ var instance = ReactDOM.render(, container);
expect(log).toEqual(['didMount']);
instance.setState({count: 2});
expect(log).toEqual(['didMount', 'didMount', 'willEnter']);
@@ -193,7 +195,7 @@ describe('ReactTransitionGroup', function() {
},
});
- var instance = React.render(, container);
+ var instance = ReactDOM.render(, container);
expect(log).toEqual(['didMount']);
instance.setState({count: 2});
expect(log).toEqual(['didMount', 'didMount', 'willEnter']);
@@ -250,7 +252,7 @@ describe('ReactTransitionGroup', function() {
},
});
- var instance = React.render(, container);
+ var instance = ReactDOM.render(, container);
expect(log).toEqual(['didMount0']);
log = [];
diff --git a/src/isomorphic/classic/__tests__/ReactContextValidator-test.js b/src/isomorphic/classic/__tests__/ReactContextValidator-test.js
index 027c536826..0fa4fd5280 100644
--- a/src/isomorphic/classic/__tests__/ReactContextValidator-test.js
+++ b/src/isomorphic/classic/__tests__/ReactContextValidator-test.js
@@ -18,6 +18,7 @@
'use strict';
var React;
+var ReactDOM;
var ReactTestUtils;
var reactComponentExpect;
@@ -27,6 +28,7 @@ describe('ReactContextValidator', function() {
require('mock-modules').dumpCache();
React = require('React');
+ ReactDOM = require('ReactDOM');
ReactTestUtils = require('ReactTestUtils');
reactComponentExpect = require('reactComponentExpect');
@@ -122,8 +124,8 @@ describe('ReactContextValidator', function() {
});
var container = document.createElement('div');
- React.render(, container);
- React.render(, container);
+ ReactDOM.render(, container);
+ ReactDOM.render(, container);
expect(actualComponentWillReceiveProps).toEqual({foo: 'def'});
expect(actualShouldComponentUpdate).toEqual({foo: 'def'});
expect(actualComponentWillUpdate).toEqual({foo: 'def'});
diff --git a/src/isomorphic/classic/class/__tests__/ReactClass-test.js b/src/isomorphic/classic/class/__tests__/ReactClass-test.js
index bf73ffdfdd..51f8a11718 100644
--- a/src/isomorphic/classic/class/__tests__/ReactClass-test.js
+++ b/src/isomorphic/classic/class/__tests__/ReactClass-test.js
@@ -14,12 +14,14 @@
var mocks = require('mocks');
var React;
+var ReactDOM;
var ReactTestUtils;
describe('ReactClass-spec', function() {
beforeEach(function() {
React = require('React');
+ ReactDOM = require('ReactDOM');
ReactTestUtils = require('ReactTestUtils');
spyOn(console, 'error');
});
@@ -311,7 +313,7 @@ describe('ReactClass-spec', function() {
});
var container = document.createElement('div');
- React.render(, container);
+ ReactDOM.render(, container);
expect(container.firstChild.className).toBe('foo');
});
@@ -372,7 +374,7 @@ describe('ReactClass-spec', function() {
});
var container = document.createElement('div');
- var instance = React.render(, container);
+ var instance = ReactDOM.render(, container);
instance.getDOMNode();
diff --git a/src/isomorphic/classic/element/__tests__/ReactElement-test.js b/src/isomorphic/classic/element/__tests__/ReactElement-test.js
index 1e715e1f45..433e4c8021 100644
--- a/src/isomorphic/classic/element/__tests__/ReactElement-test.js
+++ b/src/isomorphic/classic/element/__tests__/ReactElement-test.js
@@ -15,6 +15,7 @@
// classic JS without JSX.
var React;
+var ReactDOM;
var ReactTestUtils;
describe('ReactElement', function() {
@@ -24,6 +25,7 @@ describe('ReactElement', function() {
require('mock-modules').dumpCache();
React = require('React');
+ ReactDOM = require('ReactDOM');
ReactTestUtils = require('ReactTestUtils');
ComponentClass = React.createClass({
render: function() {
@@ -220,13 +222,13 @@ describe('ReactElement', function() {
});
var container = document.createElement('div');
- var instance = React.render(
+ var instance = ReactDOM.render(
React.createElement(Component, {fruit: 'mango'}),
container
);
expect(instance.props.fruit).toBe('mango');
- React.render(React.createElement(Component), container);
+ ReactDOM.render(React.createElement(Component), container);
expect(instance.props.fruit).toBe('persimmon');
});
@@ -265,7 +267,7 @@ describe('ReactElement', function() {
},
});
var outer = ReactTestUtils.renderIntoDocument();
- expect(React.findDOMNode(outer).className).toBe('moo');
+ expect(ReactDOM.findDOMNode(outer).className).toBe('moo');
});
it('throws when adding a prop (in dev) after element creation', function() {
@@ -284,9 +286,9 @@ describe('ReactElement', function() {
return el;
},
});
- var outer = React.render(, container);
- expect(React.findDOMNode(outer).textContent).toBe('meow');
- expect(React.findDOMNode(outer).className).toBe('');
+ var outer = ReactDOM.render(, container);
+ expect(ReactDOM.findDOMNode(outer).textContent).toBe('meow');
+ expect(ReactDOM.findDOMNode(outer).className).toBe('');
});
it('does not warn for NaN props', function() {
diff --git a/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js b/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js
index ffe68c81c6..9a6774409b 100644
--- a/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js
+++ b/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js
@@ -14,12 +14,14 @@
require('mock-modules');
var React;
+var ReactDOM;
var ReactTestUtils;
describe('ReactElementClone', function() {
beforeEach(function() {
React = require('React');
+ ReactDOM = require('ReactDOM');
ReactTestUtils = require('ReactTestUtils');
});
@@ -39,7 +41,7 @@ describe('ReactElementClone', function() {
},
});
var component = ReactTestUtils.renderIntoDocument();
- expect(React.findDOMNode(component).childNodes[0].className).toBe('xyz');
+ expect(ReactDOM.findDOMNode(component).childNodes[0].className).toBe('xyz');
});
it('should clone a composite component with new props', function() {
@@ -63,7 +65,7 @@ describe('ReactElementClone', function() {
},
});
var component = ReactTestUtils.renderIntoDocument();
- expect(React.findDOMNode(component).childNodes[0].className).toBe('xyz');
+ expect(ReactDOM.findDOMNode(component).childNodes[0].className).toBe('xyz');
});
it('should keep the original ref if it is not overridden', function() {
diff --git a/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js b/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js
index fe3d1159cc..542ca021ea 100644
--- a/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js
+++ b/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js
@@ -15,6 +15,7 @@
// classic JS without JSX.
var React;
+var ReactDOM;
var ReactFragment;
var ReactTestUtils;
@@ -25,6 +26,7 @@ describe('ReactElementValidator', function() {
require('mock-modules').dumpCache();
React = require('React');
+ ReactDOM = require('ReactDOM');
ReactFragment = require('ReactFragment');
ReactTestUtils = require('ReactTestUtils');
ComponentClass = React.createClass({
@@ -486,7 +488,7 @@ describe('ReactElementValidator', function() {
return ;
},
componentDidMount: function() {
- React.findDOMNode(this).appendChild(this.props.children);
+ ReactDOM.findDOMNode(this).appendChild(this.props.children);
},
});
diff --git a/src/isomorphic/deprecated/__tests__/cloneWithProps-test.js b/src/isomorphic/deprecated/__tests__/cloneWithProps-test.js
index b8c4343bb2..dedc4bf1b7 100644
--- a/src/isomorphic/deprecated/__tests__/cloneWithProps-test.js
+++ b/src/isomorphic/deprecated/__tests__/cloneWithProps-test.js
@@ -12,6 +12,7 @@
'use strict';
var React;
+var ReactDOM;
var ReactTestUtils;
var onlyChild;
@@ -23,6 +24,7 @@ describe('cloneWithProps', function() {
beforeEach(function() {
require('mock-modules').dumpCache();
React = require('React');
+ ReactDOM = require('ReactDOM');
ReactTestUtils = require('ReactTestUtils');
onlyChild = require('onlyChild');
cloneWithProps = require('cloneWithProps');
@@ -65,7 +67,7 @@ describe('cloneWithProps', function() {
},
});
var component = ReactTestUtils.renderIntoDocument();
- expect(React.findDOMNode(component).childNodes[0].className)
+ expect(ReactDOM.findDOMNode(component).childNodes[0].className)
.toBe('xyz child');
});
@@ -92,7 +94,7 @@ describe('cloneWithProps', function() {
},
});
var component = ReactTestUtils.renderIntoDocument();
- expect(React.findDOMNode(component).childNodes[0].className)
+ expect(ReactDOM.findDOMNode(component).childNodes[0].className)
.toBe('xyz child');
});
diff --git a/src/isomorphic/modern/class/__tests__/ReactES6Class-test.js b/src/isomorphic/modern/class/__tests__/ReactES6Class-test.js
index 0530c5bfb4..d968eb008d 100644
--- a/src/isomorphic/modern/class/__tests__/ReactES6Class-test.js
+++ b/src/isomorphic/modern/class/__tests__/ReactES6Class-test.js
@@ -12,6 +12,7 @@
'use strict';
var React;
+var ReactDOM;
describe('ReactES6Class', function() {
@@ -26,6 +27,7 @@ describe('ReactES6Class', function() {
beforeEach(function() {
React = require('React');
+ ReactDOM = require('ReactDOM');
container = document.createElement('div');
attachedListener = null;
renderedName = null;
@@ -42,7 +44,7 @@ describe('ReactES6Class', function() {
});
function test(element, expectedTag, expectedClassName) {
- var instance = React.render(element, container);
+ var instance = ReactDOM.render(element, container);
expect(container.firstChild).not.toBeNull();
expect(container.firstChild.tagName).toBe(expectedTag);
expect(container.firstChild.className).toBe(expectedClassName);
@@ -57,7 +59,7 @@ describe('ReactES6Class', function() {
it('throws if no render function is defined', function() {
spyOn(console, 'error');
class Foo extends React.Component { }
- expect(() => React.render(, container)).toThrow();
+ expect(() => ReactDOM.render(, container)).toThrow();
expect(console.error.calls.length).toBe(1);
expect(console.error.calls[0].args[0]).toBe(
@@ -308,7 +310,7 @@ describe('ReactES6Class', function() {
'did-update', freeze({value: 'foo'}), {},
]);
lifeCycles = []; // reset
- React.unmountComponentAtNode(container);
+ ReactDOM.unmountComponentAtNode(container);
expect(lifeCycles).toEqual([
'will-unmount',
]);
@@ -456,7 +458,7 @@ describe('ReactES6Class', function() {
it('supports drilling through to the DOM using findDOMNode', function() {
var instance = test(, 'DIV', 'foo');
- var node = React.findDOMNode(instance);
+ var node = ReactDOM.findDOMNode(instance);
expect(node).toBe(container.firstChild);
});
diff --git a/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js b/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js
index caf4e7f923..ab7a105f37 100644
--- a/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js
+++ b/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js
@@ -12,6 +12,7 @@
'use strict';
var React;
+var ReactDOM;
var ReactTestUtils;
describe('ReactJSXElement', function() {
@@ -21,6 +22,7 @@ describe('ReactJSXElement', function() {
require('mock-modules').dumpCache();
React = require('React');
+ ReactDOM = require('ReactDOM');
ReactTestUtils = require('ReactTestUtils');
Component = class {
render() {
@@ -161,13 +163,13 @@ describe('ReactJSXElement', function() {
Component.defaultProps = {fruit: 'persimmon'};
var container = document.createElement('div');
- var instance = React.render(
+ var instance = ReactDOM.render(
,
container
);
expect(instance.props.fruit).toBe('mango');
- React.render(, container);
+ ReactDOM.render(, container);
expect(instance.props.fruit).toBe('persimmon');
});
diff --git a/src/renderers/dom/client/__tests__/ReactDOM-test.js b/src/renderers/dom/client/__tests__/ReactDOM-test.js
index 84fdccb99e..cf88616e8c 100644
--- a/src/renderers/dom/client/__tests__/ReactDOM-test.js
+++ b/src/renderers/dom/client/__tests__/ReactDOM-test.js
@@ -12,6 +12,7 @@
'use strict';
var React = require('React');
+var ReactDOM = require('ReactDOM');
var ReactTestUtils = require('ReactTestUtils');
var div = React.createFactory('div');
@@ -48,14 +49,14 @@ describe('ReactDOM', function() {
it('allows a DOM element to be used with a string', function() {
var element = React.createElement('div', {className: 'foo'});
var instance = ReactTestUtils.renderIntoDocument(element);
- expect(React.findDOMNode(instance).tagName).toBe('DIV');
+ expect(ReactDOM.findDOMNode(instance).tagName).toBe('DIV');
});
it('should allow children to be passed as an argument', function() {
var argDiv = ReactTestUtils.renderIntoDocument(
div(null, 'child')
);
- var argNode = React.findDOMNode(argDiv);
+ var argNode = ReactDOM.findDOMNode(argDiv);
expect(argNode.innerHTML).toBe('child');
});
@@ -63,7 +64,7 @@ describe('ReactDOM', function() {
var conflictDiv = ReactTestUtils.renderIntoDocument(
div({children: 'fakechild'}, 'child')
);
- var conflictNode = React.findDOMNode(conflictDiv);
+ var conflictNode = ReactDOM.findDOMNode(conflictDiv);
expect(conflictNode.innerHTML).toBe('child');
});
@@ -105,7 +106,7 @@ describe('ReactDOM', function() {
,
);
- var root = React.findDOMNode(myDiv);
+ var root = ReactDOM.findDOMNode(myDiv);
var dog = root.childNodes[0];
expect(dog.className).toBe('bigdog');
});
diff --git a/src/renderers/dom/client/__tests__/ReactDOMSVG-test.js b/src/renderers/dom/client/__tests__/ReactDOMSVG-test.js
index 55d59330ac..2898d2c2e4 100644
--- a/src/renderers/dom/client/__tests__/ReactDOMSVG-test.js
+++ b/src/renderers/dom/client/__tests__/ReactDOMSVG-test.js
@@ -12,15 +12,17 @@
'use strict';
var React;
+var ReactDOMServer;
describe('ReactDOMSVG', function() {
beforeEach(function() {
React = require('React');
+ ReactDOMServer = require('ReactDOMServer');
});
it('creates initial namespaced markup', function() {
- var markup = React.renderToString(
+ var markup = ReactDOMServer.renderToString(
diff --git a/src/renderers/dom/client/__tests__/ReactEventListener-test.js b/src/renderers/dom/client/__tests__/ReactEventListener-test.js
index c8037150f9..cfb6bb28f5 100644
--- a/src/renderers/dom/client/__tests__/ReactEventListener-test.js
+++ b/src/renderers/dom/client/__tests__/ReactEventListener-test.js
@@ -19,6 +19,8 @@ var EVENT_TARGET_PARAM = 1;
describe('ReactEventListener', function() {
var React;
+ var ReactDOM;
+
var ReactMount;
var ReactEventListener;
var ReactTestUtils;
@@ -28,6 +30,8 @@ describe('ReactEventListener', function() {
require('mock-modules').dumpCache();
React = require('React');
+ ReactDOM = require('ReactDOM');
+
ReactMount = require('ReactMount');
ReactEventListener = require('ReactEventListener');
ReactTestUtils = require('ReactTestUtils');
@@ -47,8 +51,8 @@ describe('ReactEventListener', function() {
fromElement: otherNode,
target: otherNode,
srcElement: otherNode,
- toElement: React.findDOMNode(component),
- relatedTarget: React.findDOMNode(component),
+ toElement: ReactDOM.findDOMNode(component),
+ relatedTarget: ReactDOM.findDOMNode(component),
view: window,
path: [otherNode, otherNode],
},
@@ -65,19 +69,19 @@ describe('ReactEventListener', function() {
childControl = ReactMount.render(childControl, childContainer);
parentControl =
ReactMount.render(parentControl, parentContainer);
- React.findDOMNode(parentControl).appendChild(childContainer);
+ ReactDOM.findDOMNode(parentControl).appendChild(childContainer);
var callback = ReactEventListener.dispatchEvent.bind(null, 'test');
callback({
- target: React.findDOMNode(childControl),
+ target: ReactDOM.findDOMNode(childControl),
});
var calls = handleTopLevel.mock.calls;
expect(calls.length).toBe(2);
expect(calls[0][EVENT_TARGET_PARAM])
- .toBe(React.findDOMNode(childControl));
+ .toBe(ReactDOM.findDOMNode(childControl));
expect(calls[1][EVENT_TARGET_PARAM])
- .toBe(React.findDOMNode(parentControl));
+ .toBe(ReactDOM.findDOMNode(parentControl));
});
it('should propagate events two levels down', function() {
@@ -92,22 +96,22 @@ describe('ReactEventListener', function() {
ReactMount.render(parentControl, parentContainer);
grandParentControl =
ReactMount.render(grandParentControl, grandParentContainer);
- React.findDOMNode(parentControl).appendChild(childContainer);
- React.findDOMNode(grandParentControl).appendChild(parentContainer);
+ ReactDOM.findDOMNode(parentControl).appendChild(childContainer);
+ ReactDOM.findDOMNode(grandParentControl).appendChild(parentContainer);
var callback = ReactEventListener.dispatchEvent.bind(null, 'test');
callback({
- target: React.findDOMNode(childControl),
+ target: ReactDOM.findDOMNode(childControl),
});
var calls = handleTopLevel.mock.calls;
expect(calls.length).toBe(3);
expect(calls[0][EVENT_TARGET_PARAM])
- .toBe(React.findDOMNode(childControl));
+ .toBe(ReactDOM.findDOMNode(childControl));
expect(calls[1][EVENT_TARGET_PARAM])
- .toBe(React.findDOMNode(parentControl));
+ .toBe(ReactDOM.findDOMNode(parentControl));
expect(calls[2][EVENT_TARGET_PARAM])
- .toBe(React.findDOMNode(grandParentControl));
+ .toBe(ReactDOM.findDOMNode(grandParentControl));
});
it('should not get confused by disappearing elements', function() {
@@ -118,13 +122,13 @@ describe('ReactEventListener', function() {
childControl = ReactMount.render(childControl, childContainer);
parentControl =
ReactMount.render(parentControl, parentContainer);
- React.findDOMNode(parentControl).appendChild(childContainer);
+ ReactDOM.findDOMNode(parentControl).appendChild(childContainer);
// ReactBrowserEventEmitter.handleTopLevel might remove the
// target from the DOM. Here, we have handleTopLevel remove the
// node when the first event handlers are called; we'll still
// expect to receive a second call for the parent control.
- var childNode = React.findDOMNode(childControl);
+ var childNode = ReactDOM.findDOMNode(childControl);
handleTopLevel.mockImplementation(
function(topLevelType, topLevelTarget, topLevelTargetID, nativeEvent) {
if (topLevelTarget === childNode) {
@@ -142,7 +146,7 @@ describe('ReactEventListener', function() {
expect(calls.length).toBe(2);
expect(calls[0][EVENT_TARGET_PARAM]).toBe(childNode);
expect(calls[1][EVENT_TARGET_PARAM])
- .toBe(React.findDOMNode(parentControl));
+ .toBe(ReactDOM.findDOMNode(parentControl));
});
it('should batch between handlers from different roots', function() {
@@ -156,11 +160,11 @@ describe('ReactEventListener', function() {
Parent
,
parentContainer
);
- React.findDOMNode(parentControl).appendChild(childContainer);
+ ReactDOM.findDOMNode(parentControl).appendChild(childContainer);
// Suppose an event handler in each root enqueues an update to the
// childControl element -- the two updates should get batched together.
- var childNode = React.findDOMNode(childControl);
+ var childNode = ReactDOM.findDOMNode(childControl);
handleTopLevel.mockImplementation(
function(topLevelType, topLevelTarget, topLevelTargetID, nativeEvent) {
ReactMount.render(
@@ -202,12 +206,12 @@ describe('ReactEventListener', function() {
var callback = ReactEventListener.dispatchEvent.bind(null, 'test');
callback({
- target: React.findDOMNode(instance.getInner()),
+ target: ReactDOM.findDOMNode(instance.getInner()),
});
var calls = handleTopLevel.mock.calls;
expect(calls.length).toBe(1);
expect(calls[0][EVENT_TARGET_PARAM])
- .toBe(React.findDOMNode(instance.getInner()));
+ .toBe(ReactDOM.findDOMNode(instance.getInner()));
});
});
diff --git a/src/renderers/dom/client/__tests__/ReactMount-test.js b/src/renderers/dom/client/__tests__/ReactMount-test.js
index efbd115432..66ff96e686 100644
--- a/src/renderers/dom/client/__tests__/ReactMount-test.js
+++ b/src/renderers/dom/client/__tests__/ReactMount-test.js
@@ -15,6 +15,8 @@ var mocks = require('mocks');
describe('ReactMount', function() {
var React = require('React');
+ var ReactDOM = require('ReactDOM');
+ var ReactDOMServer = require('ReactDOMServer');
var ReactMount = require('ReactMount');
var ReactTestUtils = require('ReactTestUtils');
var WebComponents = WebComponents;
@@ -33,7 +35,7 @@ describe('ReactMount', function() {
it('throws when given a non-node', function() {
var nodeArray = document.getElementsByTagName('div');
expect(function() {
- React.unmountComponentAtNode(nodeArray);
+ ReactDOM.unmountComponentAtNode(nodeArray);
}).toThrow(
'Invariant Violation: unmountComponentAtNode(...): Target container ' +
'is not a DOM element.'
@@ -114,21 +116,21 @@ describe('ReactMount', function() {
it('should reuse markup if rendering to the same target twice', function() {
var container = document.createElement('container');
- var instance1 = React.render(, container);
- var instance2 = React.render(, container);
+ var instance1 = ReactDOM.render(, container);
+ var instance2 = ReactDOM.render(, container);
expect(instance1 === instance2).toBe(true);
});
it('should warn if mounting into dirty rendered markup', function() {
var container = document.createElement('container');
- container.innerHTML = React.renderToString() + ' ';
+ container.innerHTML = ReactDOMServer.renderToString() + ' ';
spyOn(console, 'error');
ReactMount.render(, container);
expect(console.error.calls.length).toBe(1);
- container.innerHTML = ' ' + React.renderToString();
+ container.innerHTML = ' ' + ReactDOMServer.renderToString();
ReactMount.render(, container);
expect(console.error.calls.length).toBe(2);
@@ -158,12 +160,12 @@ describe('ReactMount', function() {
it('should account for escaping on a checksum mismatch', function () {
var div = document.createElement('div');
- var markup = React.renderToString(
+ var markup = ReactDOMServer.renderToString(
This markup contains an nbsp entity: server text
);
div.innerHTML = markup;
spyOn(console, 'error');
- React.render(
+ ReactDOM.render(
This markup contains an nbsp entity: client text
,
div
);
@@ -182,15 +184,15 @@ describe('ReactMount', function() {
createdCallback: {
value: function() {
shadowRoot = this.createShadowRoot();
- React.render(Hi, from within a WC!
, shadowRoot);
+ ReactDOM.render(Hi, from within a WC!
, shadowRoot);
expect(shadowRoot.firstChild.tagName).toBe('DIV');
- React.render(Hi, from within a WC!, shadowRoot);
+ ReactDOM.render(Hi, from within a WC!, shadowRoot);
expect(shadowRoot.firstChild.tagName).toBe('SPAN');
},
},
});
proto.unmount = function() {
- React.unmountComponentAtNode(shadowRoot);
+ ReactDOM.unmountComponentAtNode(shadowRoot);
};
document.registerElement('x-foo', {prototype: proto});
var element = document.createElement('x-foo');
diff --git a/src/renderers/dom/client/__tests__/ReactMountDestruction-test.js b/src/renderers/dom/client/__tests__/ReactMountDestruction-test.js
index d13071f547..6dbc1b6985 100644
--- a/src/renderers/dom/client/__tests__/ReactMountDestruction-test.js
+++ b/src/renderers/dom/client/__tests__/ReactMountDestruction-test.js
@@ -12,6 +12,7 @@
'use strict';
var React = require('React');
+var ReactDOM = require('ReactDOM');
describe('ReactMount', function() {
it('should destroy a react root upon request', function() {
@@ -24,7 +25,7 @@ describe('ReactMount', function() {
);
var firstRootDiv = document.createElement('div');
mainContainerDiv.appendChild(firstRootDiv);
- React.render(instanceOne, firstRootDiv);
+ ReactDOM.render(instanceOne, firstRootDiv);
var instanceTwo = (
@@ -32,16 +33,16 @@ describe('ReactMount', function() {
);
var secondRootDiv = document.createElement('div');
mainContainerDiv.appendChild(secondRootDiv);
- React.render(instanceTwo, secondRootDiv);
+ ReactDOM.render(instanceTwo, secondRootDiv);
// Test that two react roots are rendered in isolation
expect(firstRootDiv.firstChild.className).toBe('firstReactDiv');
expect(secondRootDiv.firstChild.className).toBe('secondReactDiv');
// Test that after unmounting each, they are no longer in the document.
- React.unmountComponentAtNode(firstRootDiv);
+ ReactDOM.unmountComponentAtNode(firstRootDiv);
expect(firstRootDiv.firstChild).toBeNull();
- React.unmountComponentAtNode(secondRootDiv);
+ ReactDOM.unmountComponentAtNode(secondRootDiv);
expect(secondRootDiv.firstChild).toBeNull();
});
});
diff --git a/src/renderers/dom/client/__tests__/ReactRenderDocument-test.js b/src/renderers/dom/client/__tests__/ReactRenderDocument-test.js
index 667f73d46d..e2748f20c3 100644
--- a/src/renderers/dom/client/__tests__/ReactRenderDocument-test.js
+++ b/src/renderers/dom/client/__tests__/ReactRenderDocument-test.js
@@ -12,6 +12,8 @@
'use strict';
var React;
+var ReactDOM;
+var ReactDOMServer;
var ReactInstanceMap;
var ReactMount;
@@ -31,6 +33,8 @@ describe('rendering React components at document', function() {
require('mock-modules').dumpCache();
React = require('React');
+ ReactDOM = require('ReactDOM');
+ ReactDOMServer = require('ReactDOMServer');
ReactInstanceMap = require('ReactInstanceMap');
ReactMount = require('ReactMount');
getTestDocument = require('getTestDocument');
@@ -56,9 +60,9 @@ describe('rendering React components at document', function() {
},
});
- var markup = React.renderToString();
+ var markup = ReactDOMServer.renderToString();
testDocument = getTestDocument(markup);
- var component = React.render(, testDocument);
+ var component = ReactDOM.render(, testDocument);
expect(testDocument.body.innerHTML).toBe('Hello world');
// TODO: This is a bad test. I have no idea what this is testing.
@@ -85,13 +89,13 @@ describe('rendering React components at document', function() {
},
});
- var markup = React.renderToString();
+ var markup = ReactDOMServer.renderToString();
testDocument = getTestDocument(markup);
- React.render(, testDocument);
+ ReactDOM.render(, testDocument);
expect(testDocument.body.innerHTML).toBe('Hello world');
expect(function() {
- React.unmountComponentAtNode(testDocument);
+ ReactDOM.unmountComponentAtNode(testDocument);
}).toThrow(UNMOUNT_INVARIANT_MESSAGE);
expect(testDocument.body.innerHTML).toBe('Hello world');
@@ -130,16 +134,16 @@ describe('rendering React components at document', function() {
},
});
- var markup = React.renderToString();
+ var markup = ReactDOMServer.renderToString();
testDocument = getTestDocument(markup);
- React.render(, testDocument);
+ ReactDOM.render(, testDocument);
expect(testDocument.body.innerHTML).toBe('Hello world');
// Reactive update
expect(function() {
- React.render(, testDocument);
+ ReactDOM.render(, testDocument);
}).toThrow(UNMOUNT_INVARIANT_MESSAGE);
expect(testDocument.body.innerHTML).toBe('Hello world');
@@ -163,12 +167,12 @@ describe('rendering React components at document', function() {
},
});
- var markup = React.renderToString(
+ var markup = ReactDOMServer.renderToString(
);
testDocument = getTestDocument(markup);
- React.render(, testDocument);
+ ReactDOM.render(, testDocument);
expect(testDocument.body.innerHTML).toBe('Hello world');
});
@@ -191,14 +195,14 @@ describe('rendering React components at document', function() {
},
});
- var markup = React.renderToString(
+ var markup = ReactDOMServer.renderToString(
);
testDocument = getTestDocument(markup);
expect(function() {
// Notice the text is different!
- React.render(, testDocument);
+ ReactDOM.render(, testDocument);
}).toThrow(
'Invariant Violation: ' +
'You\'re trying to render a component to the document using ' +
@@ -235,7 +239,7 @@ describe('rendering React components at document', function() {
});
expect(function() {
- React.render(, container);
+ ReactDOM.render(, container);
}).toThrow(
'Invariant Violation: You\'re trying to render a component to the ' +
'document but you didn\'t use server rendering. We can\'t do this ' +
@@ -255,10 +259,10 @@ describe('rendering React components at document', function() {