@samitouri / QOS-React-2 / commits / 1c86f5836a

Codemod deprecated API usage away

Paul O’Shannessy committed Oct 7, 2014 at 17:22 UTC 1c86f5836a0f9597acd515f42a556ed12d1f5c43

25 files changed +153 -153

src/addons/link/__tests__/LinkedStateMixin-test.js

+1 -1

@@ -44,7 +44,7 @@ describe('LinkedStateMixin', function() {

44 }

45 });

46 var container = document.createElement('div');

47 - var component = React.renderComponent(<Component />, container);

47 + var component = React.render(<Component />, container);

48 var link = component.linkState('value');

49 expect(component.state.value).toBe('initial value');

50 expect(link.value).toBe('initial value');

src/addons/transitions/__tests__/ReactCSSTransitionGroup-test.js

+13 -13

@@ -36,7 +36,7 @@ describe('ReactCSSTransitionGroup', function() {

36 });

38 it('should warn after time with no transitionend', function() {

39 - var a = React.renderComponent(

39 + var a = React.render(

40 <ReactCSSTransitionGroup transitionName="yolo">

41 <span key="one" id="one" />

42 </ReactCSSTransitionGroup>,

@@ -46,7 +46,7 @@ describe('ReactCSSTransitionGroup', function() {

47 setTimeout.mock.calls.length = 0;

49 - React.renderComponent(

49 + React.render(

50 <ReactCSSTransitionGroup transitionName="yolo">

51 <span key="two" id="two" />

52 </ReactCSSTransitionGroup>,

@@ -72,14 +72,14 @@ describe('ReactCSSTransitionGroup', function() {

72 });

74 it('should keep both sets of DOM nodes around', function() {

75 - var a = React.renderComponent(

75 + var a = React.render(

76 <ReactCSSTransitionGroup transitionName="yolo">

77 <span key="one" id="one" />

78 </ReactCSSTransitionGroup>,

79 container

80 );

81 expect(a.getDOMNode().childNodes.length).toBe(1);

82 - React.renderComponent(

82 + React.render(

83 <ReactCSSTransitionGroup transitionName="yolo">

84 <span key="two" id="two" />

85 </ReactCSSTransitionGroup>,

@@ -91,7 +91,7 @@ describe('ReactCSSTransitionGroup', function() {

91 });

93 it('should switch transitionLeave from false to true', function() {

94 - var a = React.renderComponent(

94 + var a = React.render(

95 <ReactCSSTransitionGroup

96 transitionName="yolo"

97 transitionEnter={false}

@@ -101,7 +101,7 @@ describe('ReactCSSTransitionGroup', function() {

101 container

102 );

103 expect(a.getDOMNode().childNodes.length).toBe(1);

104 - React.renderComponent(

104 + React.render(

105 <ReactCSSTransitionGroup

106 transitionName="yolo"

107 transitionEnter={false}

@@ -111,7 +111,7 @@ describe('ReactCSSTransitionGroup', function() {

111 container

112 );

113 expect(a.getDOMNode().childNodes.length).toBe(1);

114 - React.renderComponent(

114 + React.render(

115 <ReactCSSTransitionGroup

116 transitionName="yolo"

117 transitionEnter={false}

@@ -126,7 +126,7 @@ describe('ReactCSSTransitionGroup', function() {

126 });

127

128 it('should work with no children', function() {

129 - React.renderComponent(

129 + React.render(

130 <ReactCSSTransitionGroup transitionName="yolo">

131 </ReactCSSTransitionGroup>,

132 container

@@ -134,7 +134,7 @@ describe('ReactCSSTransitionGroup', function() {

134 });

135

136 it('should work with a null child', function() {

137 - React.renderComponent(

137 + React.render(

138 <ReactCSSTransitionGroup transitionName="yolo">

139 {[null]}

140 </ReactCSSTransitionGroup>,

@@ -143,14 +143,14 @@ describe('ReactCSSTransitionGroup', function() {

143 });

144

145 it('should transition from one to null', function() {

146 - var a = React.renderComponent(

146 + var a = React.render(

147 <ReactCSSTransitionGroup transitionName="yolo">

148 <span key="one" id="one" />

149 </ReactCSSTransitionGroup>,

150 container

151 );

152 expect(a.getDOMNode().childNodes.length).toBe(1);

153 - React.renderComponent(

153 + React.render(

154 <ReactCSSTransitionGroup transitionName="yolo">

155 {null}

156 </ReactCSSTransitionGroup>,

@@ -163,14 +163,14 @@ describe('ReactCSSTransitionGroup', function() {

163 });

164

165 it('should transition from false to one', function() {

166 - var a = React.renderComponent(

166 + var a = React.render(

167 <ReactCSSTransitionGroup transitionName="yolo">

168 {false}

169 </ReactCSSTransitionGroup>,

170 container

171 );

172 expect(a.getDOMNode().childNodes.length).toBe(0);

173 - React.renderComponent(

173 + React.render(

174 <ReactCSSTransitionGroup transitionName="yolo">

175 <span key="one" id="one" />

176 </ReactCSSTransitionGroup>,

src/addons/transitions/__tests__/ReactTransitionGroup-test.js

+3 -3

@@ -78,7 +78,7 @@ describe('ReactTransitionGroup', function() {

78 }

79 });

81 - var instance = React.renderComponent(<Component />, container);

81 + var instance = React.render(<Component />, container);

82 expect(log).toEqual(['didMount']);

84 instance.setState({count: 2}, function() {

@@ -135,7 +135,7 @@ describe('ReactTransitionGroup', function() {

135 }

136 });

137

138 - var instance = React.renderComponent(<Component />, container);

138 + var instance = React.render(<Component />, container);

139 expect(log).toEqual(['didMount']);

140 instance.setState({count: 2});

141 expect(log).toEqual(['didMount', 'didMount', 'willEnter']);

@@ -194,7 +194,7 @@ describe('ReactTransitionGroup', function() {

194 }

195 });

196

197 - var instance = React.renderComponent(<Component />, container);

197 + var instance = React.render(<Component />, container);

198 expect(log).toEqual(['didMount']);

199 instance.setState({count: 2});

200 expect(log).toEqual(['didMount', 'didMount', 'willEnter']);

src/browser/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js

+1 -1

@@ -50,7 +50,7 @@ describe('EnterLeaveEventPlugin', function() {

50 );

51 iframeDocument.close();

53 - var component = React.renderComponent(<div />, iframeDocument.body);

53 + var component = React.render(<div />, iframeDocument.body);

54 var div = component.getDOMNode();

56 var extracted = EnterLeaveEventPlugin.extractEvents(

src/browser/server/__tests__/ReactServerRendering-test.js

+19 -19

@@ -59,7 +59,7 @@ describe('ReactServerRendering', function() {

60 describe('renderComponentToString', function() {

61 it('should generate simple markup', function() {

62 - var response = ReactServerRendering.renderComponentToString(

62 + var response = ReactServerRendering.renderToString(

63 <span>hello world</span>

64 );

65 expect(response).toMatch(

@@ -72,7 +72,7 @@ describe('ReactServerRendering', function() {

72 var EventPluginHub = require('EventPluginHub');

73 var cb = mocks.getMockFunction();

75 - ReactServerRendering.renderComponentToString(

75 + ReactServerRendering.renderToString(

76 <span onClick={cb}>hello world</span>

77 );

78 expect(EventPluginHub.__getListenerBank()).toEqual({});

@@ -89,7 +89,7 @@ describe('ReactServerRendering', function() {

89 return <span>My name is {this.props.name}</span>;

90 }

91 });

92 - var response = ReactServerRendering.renderComponentToString(

92 + var response = ReactServerRendering.renderToString(

93 <Parent />

94 );

95 expect(response).toMatch(

@@ -138,7 +138,7 @@ describe('ReactServerRendering', function() {

138 }

139 });

140

141 - var response = ReactServerRendering.renderComponentToString(

141 + var response = ReactServerRendering.renderToString(

142 <TestComponent />

143 );

144

@@ -183,20 +183,20 @@ describe('ReactServerRendering', function() {

183 });

184

185 var element = document.createElement('div');

186 - React.renderComponent(<TestComponent />, element);

186 + React.render(<TestComponent />, element);

187

188 var lastMarkup = element.innerHTML;

189

190 // Exercise the update path. Markup should not change,

191 // but some lifecycle methods should be run again.

192 - React.renderComponent(<TestComponent name="x" />, element);

192 + React.render(<TestComponent name="x" />, element);

193 expect(mountCount).toEqual(1);

194

195 // Unmount and remount. We should get another mount event and

196 // we should get different markup, as the IDs are unique each time.

197 React.unmountComponentAtNode(element);

198 expect(element.innerHTML).toEqual('');

199 - React.renderComponent(<TestComponent name="x" />, element);

199 + React.render(<TestComponent name="x" />, element);

200 expect(mountCount).toEqual(2);

201 expect(element.innerHTML).not.toEqual(lastMarkup);

202

@@ -208,13 +208,13 @@ describe('ReactServerRendering', function() {

208 expect(element.innerHTML).toEqual('');

209

210 ExecutionEnvironment.canUseDOM = false;

211 - lastMarkup = ReactServerRendering.renderComponentToString(

211 + lastMarkup = ReactServerRendering.renderToString(

212 <TestComponent name="x" />

213 );

214 ExecutionEnvironment.canUseDOM = true;

215 element.innerHTML = lastMarkup + ' __sentinel__';

216

217 - React.renderComponent(<TestComponent name="x" />, element);

217 + React.render(<TestComponent name="x" />, element);

218 expect(mountCount).toEqual(3);

219 expect(element.innerHTML.indexOf('__sentinel__') > -1).toBe(true);

220 React.unmountComponentAtNode(element);

@@ -225,7 +225,7 @@ describe('ReactServerRendering', function() {

225 var _warn = console.warn;

226 console.warn = mocks.getMockFunction();

227 element.innerHTML = lastMarkup;

228 - var instance = React.renderComponent(<TestComponent name="y" />, element);

228 + var instance = React.render(<TestComponent name="y" />, element);

229 expect(mountCount).toEqual(4);

230 expect(console.warn.mock.calls.length).toBe(1);

231 expect(element.innerHTML.length > 0).toBe(true);

@@ -240,12 +240,12 @@ describe('ReactServerRendering', function() {

240

241 it('should throw with silly args', function() {

242 expect(

243 - ReactServerRendering.renderComponentToString.bind(

243 + ReactServerRendering.renderToString.bind(

244 ReactServerRendering,

245 'not a component'

246 )

247 ).toThrow(

248 - 'Invariant Violation: renderComponentToString(): You must pass ' +

248 + 'Invariant Violation: renderToString(): You must pass ' +

249 'a valid ReactElement.'

250 );

251 });

@@ -267,7 +267,7 @@ describe('ReactServerRendering', function() {

267 }

268 });

269

270 - var response = ReactServerRendering.renderComponentToStaticMarkup(

270 + var response = ReactServerRendering.renderToStaticMarkup(

271 <TestComponent />

272 );

273

@@ -281,7 +281,7 @@ describe('ReactServerRendering', function() {

281 }

282 });

283

284 - var response = ReactServerRendering.renderComponentToStaticMarkup(

284 + var response = ReactServerRendering.renderToStaticMarkup(

285 <TestComponent />

286 );

287

@@ -292,7 +292,7 @@ describe('ReactServerRendering', function() {

292 var EventPluginHub = require('EventPluginHub');

293 var cb = mocks.getMockFunction();

294

295 - ReactServerRendering.renderComponentToString(

295 + ReactServerRendering.renderToString(

296 <span onClick={cb}>hello world</span>

297 );

298 expect(EventPluginHub.__getListenerBank()).toEqual({});

@@ -333,7 +333,7 @@ describe('ReactServerRendering', function() {

333 }

334 });

335

336 - var response = ReactServerRendering.renderComponentToStaticMarkup(

336 + var response = ReactServerRendering.renderToStaticMarkup(

337 <TestComponent />

338 );

339

@@ -352,12 +352,12 @@ describe('ReactServerRendering', function() {

352

353 it('should throw with silly args', function() {

354 expect(

355 - ReactServerRendering.renderComponentToStaticMarkup.bind(

355 + ReactServerRendering.renderToStaticMarkup.bind(

356 ReactServerRendering,

357 'not a component'

358 )

359 ).toThrow(

360 - 'Invariant Violation: renderComponentToStaticMarkup(): You must pass ' +

360 + 'Invariant Violation: renderToStaticMarkup(): You must pass ' +

361 'a valid ReactElement.'

362 );

363 });

@@ -376,7 +376,7 @@ describe('ReactServerRendering', function() {

376 // We shouldn't ever be calling this on the server

377 throw new Error('Browser reconcile transaction should not be used');

378 };

379 - var markup = ReactServerRendering.renderComponentToString(

379 + var markup = ReactServerRendering.renderToString(

380 <Component />

381 );

382 expect(markup.indexOf('hello, world') >= 0).toBe(true);

src/browser/ui/__tests__/ReactDOMComponent-test.js

+6 -6

@@ -369,10 +369,10 @@ describe('ReactDOMComponent', function() {

369 });

370

371 it("should validate against multiple children props", function() {

372 - React.renderComponent(<div></div>, container);

372 + React.render(<div></div>, container);

373

374 expect(function() {

375 - React.renderComponent(

375 + React.render(

376 <div children="" dangerouslySetInnerHTML={{__html: ''}}></div>,

377 container

378 );

@@ -384,7 +384,7 @@ describe('ReactDOMComponent', function() {

384

385 it("should warn about contentEditable and children", function() {

386 spyOn(console, 'warn');

387 - React.renderComponent(

387 + React.render(

388 <div contentEditable><div /></div>,

389 container

390 );

@@ -393,10 +393,10 @@ describe('ReactDOMComponent', function() {

393 });

394

395 it("should validate against invalid styles", function() {

396 - React.renderComponent(<div></div>, container);

396 + React.render(<div></div>, container);

397

398 expect(function() {

399 - React.renderComponent(<div style={1}></div>, container);

399 + React.render(<div style={1}></div>, container);

400 }).toThrow(

401 'Invariant Violation: The `style` prop expects a mapping from style ' +

402 'properties to values, not a string.'

@@ -415,7 +415,7 @@ describe('ReactDOMComponent', function() {

415

416 var callback = function() {};

417 var instance = <div onClick={callback} />;

418 - instance = React.renderComponent(instance, container);

418 + instance = React.render(instance, container);

419

420 var rootNode = instance.getDOMNode();

421 var rootNodeID = ReactMount.getID(rootNode);

src/browser/ui/__tests__/ReactEventListener-test.js

+11 -11

@@ -47,9 +47,9 @@ describe('ReactEventListener', function() {

47 var childControl = <div>Child</div>;

48 var parentContainer = document.createElement('div');

49 var parentControl = <div>Parent</div>;

50 - childControl = ReactMount.renderComponent(childControl, childContainer);

50 + childControl = ReactMount.render(childControl, childContainer);

51 parentControl =

52 - ReactMount.renderComponent(parentControl, parentContainer);

52 + ReactMount.render(parentControl, parentContainer);

53 parentControl.getDOMNode().appendChild(childContainer);

55 var callback = ReactEventListener.dispatchEvent.bind(null, 'test');

@@ -70,11 +70,11 @@ describe('ReactEventListener', function() {

70 var parentControl = <div>Parent</div>;

71 var grandParentContainer = document.createElement('div');

72 var grandParentControl = <div>Parent</div>;

73 - childControl = ReactMount.renderComponent(childControl, childContainer);

73 + childControl = ReactMount.render(childControl, childContainer);

74 parentControl =

75 - ReactMount.renderComponent(parentControl, parentContainer);

75 + ReactMount.render(parentControl, parentContainer);

76 grandParentControl =

77 - ReactMount.renderComponent(grandParentControl, grandParentContainer);

77 + ReactMount.render(grandParentControl, grandParentContainer);

78 parentControl.getDOMNode().appendChild(childContainer);

79 grandParentControl.getDOMNode().appendChild(parentContainer);

@@ -96,9 +96,9 @@ describe('ReactEventListener', function() {

96 var childControl = <div>Child</div>;

97 var parentContainer = document.createElement('div');

98 var parentControl = <div>Parent</div>;

99 - childControl = ReactMount.renderComponent(childControl, childContainer);

99 + childControl = ReactMount.render(childControl, childContainer);

100 parentControl =

101 - ReactMount.renderComponent(parentControl, parentContainer);

101 + ReactMount.render(parentControl, parentContainer);

102 parentControl.getDOMNode().appendChild(childContainer);

103

104 // ReactBrowserEventEmitter.handleTopLevel might remove the

@@ -128,11 +128,11 @@ describe('ReactEventListener', function() {

128 it('should batch between handlers from different roots', function() {

129 var childContainer = document.createElement('div');

130 var parentContainer = document.createElement('div');

131 - var childControl = ReactMount.renderComponent(

131 + var childControl = ReactMount.render(

132 <div>Child</div>,

133 childContainer

134 );

135 - var parentControl = ReactMount.renderComponent(

135 + var parentControl = ReactMount.render(

136 <div>Parent</div>,

137 parentContainer

138 );

@@ -143,7 +143,7 @@ describe('ReactEventListener', function() {

143 var childNode = childControl.getDOMNode();

144 handleTopLevel.mockImplementation(

145 function(topLevelType, topLevelTarget, topLevelTargetID, nativeEvent) {

146 - ReactMount.renderComponent(

146 + ReactMount.render(

147 <div>{topLevelTarget === childNode ? '1' : '2'}</div>,

148 childContainer

149 );

@@ -179,7 +179,7 @@ describe('ReactEventListener', function() {

179

180 });

181

182 - var instance = ReactMount.renderComponent(<Wrapper />, container);

182 + var instance = ReactMount.render(<Wrapper />, container);

183

184 var callback = ReactEventListener.dispatchEvent.bind(null, 'test');

185 callback({

src/browser/ui/__tests__/ReactMount-test.js

+7 -7

@@ -66,10 +66,10 @@ describe('ReactMount', function() {

66 var container = document.createElement('container');

67 document.documentElement.appendChild(container);

69 - ReactMount.renderComponent(<div></div>, container);

69 + ReactMount.render(<div></div>, container);

70 expect(container.firstChild.nodeName).toBe('DIV');

72 - ReactMount.renderComponent(<span></span>, container);

72 + ReactMount.render(<span></span>, container);

73 expect(container.firstChild.nodeName).toBe('SPAN');

74 });

@@ -90,19 +90,19 @@ describe('ReactMount', function() {

90 expect(mockMount.mock.calls.length).toBe(0);

91 expect(mockUnmount.mock.calls.length).toBe(0);

93 - ReactMount.renderComponent(<Component text="orange" key="A" />, container);

93 + ReactMount.render(<Component text="orange" key="A" />, container);

94 expect(container.firstChild.innerHTML).toBe('orange');

95 expect(mockMount.mock.calls.length).toBe(1);

96 expect(mockUnmount.mock.calls.length).toBe(0);

98 // If we change the key, the component is unmounted and remounted

99 - ReactMount.renderComponent(<Component text="green" key="B" />, container);

99 + ReactMount.render(<Component text="green" key="B" />, container);

100 expect(container.firstChild.innerHTML).toBe('green');

101 expect(mockMount.mock.calls.length).toBe(2);

102 expect(mockUnmount.mock.calls.length).toBe(1);

103

104 // But if we don't change the key, the component instance is reused

105 - ReactMount.renderComponent(<Component text="blue" key="B" />, container);

105 + ReactMount.render(<Component text="blue" key="B" />, container);

106 expect(container.firstChild.innerHTML).toBe('blue');

107 expect(mockMount.mock.calls.length).toBe(2);

108 expect(mockUnmount.mock.calls.length).toBe(1);

@@ -110,8 +110,8 @@ describe('ReactMount', function() {

110

111 it('should reuse markup if rendering to the same target twice', function() {

112 var container = document.createElement('container');

113 - var instance1 = React.renderComponent(<div />, container);

114 - var instance2 = React.renderComponent(<div />, container);

113 + var instance1 = React.render(<div />, container);

114 + var instance2 = React.render(<div />, container);

115

116 expect(instance1 === instance2).toBe(true);

117 });

src/browser/ui/__tests__/ReactMountDestruction-test.js

+2 -2

@@ -31,7 +31,7 @@ describe('ReactMount', function() {

31 );

32 var firstRootDiv = document.createElement('div');

33 mainContainerDiv.appendChild(firstRootDiv);

34 - React.renderComponent(instanceOne, firstRootDiv);

34 + React.render(instanceOne, firstRootDiv);

36 var instanceTwo = (

37 <div className="secondReactDiv">

@@ -39,7 +39,7 @@ describe('ReactMount', function() {

39 );

40 var secondRootDiv = document.createElement('div');

41 mainContainerDiv.appendChild(secondRootDiv);

42 - React.renderComponent(instanceTwo, secondRootDiv);

42 + React.render(instanceTwo, secondRootDiv);

44 // Test that two react roots are rendered in isolation

45 expect(firstRootDiv.firstChild.className).toBe('firstReactDiv');

src/browser/ui/__tests__/ReactRenderDocument-test.js

+12 -12

@@ -63,9 +63,9 @@ describe('rendering React components at document', function() {

63 }

64 });

66 - var markup = React.renderComponentToString(<Root />);

66 + var markup = React.renderToString(<Root />);

67 testDocument = getTestDocument(markup);

68 - var component = React.renderComponent(<Root />, testDocument);

68 + var component = React.render(<Root />, testDocument);

69 expect(testDocument.body.innerHTML).toBe('Hello world');

71 var componentID = ReactMount.getReactRootID(testDocument);

@@ -90,9 +90,9 @@ describe('rendering React components at document', function() {

90 }

91 });

93 - var markup = React.renderComponentToString(<Root />);

93 + var markup = React.renderToString(<Root />);

94 testDocument = getTestDocument(markup);

95 - React.renderComponent(<Root />, testDocument);

95 + React.render(<Root />, testDocument);

96 expect(testDocument.body.innerHTML).toBe('Hello world');

98 expect(function() {

@@ -135,16 +135,16 @@ describe('rendering React components at document', function() {

135 }

136 });

137

138 - var markup = React.renderComponentToString(<Component />);

138 + var markup = React.renderToString(<Component />);

139 testDocument = getTestDocument(markup);

140

141 - React.renderComponent(<Component />, testDocument);

141 + React.render(<Component />, testDocument);

142

143 expect(testDocument.body.innerHTML).toBe('Hello world');

144

145 // Reactive update

146 expect(function() {

147 - React.renderComponent(<Component2 />, testDocument);

147 + React.render(<Component2 />, testDocument);

148 }).toThrow(UNMOUNT_INVARIANT_MESSAGE);

149

150 expect(testDocument.body.innerHTML).toBe('Hello world');

@@ -168,12 +168,12 @@ describe('rendering React components at document', function() {

168 }

169 });

170

171 - var markup = React.renderComponentToString(

171 + var markup = React.renderToString(

172 <Component text="Hello world" />

173 );

174 testDocument = getTestDocument(markup);

175

176 - React.renderComponent(<Component text="Hello world" />, testDocument);

176 + React.render(<Component text="Hello world" />, testDocument);

177

178 expect(testDocument.body.innerHTML).toBe('Hello world');

179 });

@@ -196,14 +196,14 @@ describe('rendering React components at document', function() {

196 }

197 });

198

199 - var markup = React.renderComponentToString(

199 + var markup = React.renderToString(

200 <Component text="Goodbye world" />

201 );

202 testDocument = getTestDocument(markup);

203

204 expect(function() {

205 // Notice the text is different!

206 - React.renderComponent(<Component text="Hello world" />, testDocument);

206 + React.render(<Component text="Hello world" />, testDocument);

207 }).toThrow(

208 'Invariant Violation: ' +

209 'You\'re trying to render a component to the document using ' +

@@ -238,7 +238,7 @@ describe('rendering React components at document', function() {

238 });

239

240 expect(function() {

241 - React.renderComponent(<Component />, container);

241 + React.render(<Component />, container);

242 }).toThrow(

243 'Invariant Violation: You\'re trying to render a component to the ' +

244 'document but you didn\'t use server rendering. We can\'t do this ' +

src/browser/ui/dom/Danger.js

+2 -2

@@ -63,7 +63,7 @@ var Danger = {

63 'dangerouslyRenderMarkup(...): Cannot render markup in a worker ' +

64 'thread. Make sure `window` and `document` are available globally ' +

65 'before requiring React when unit testing or use ' +

66 - 'React.renderComponentToString for server rendering.'

66 + 'React.renderToString for server rendering.'

67 );

68 var nodeName;

69 var markupByNodeName = {};

@@ -169,7 +169,7 @@ var Danger = {

169 'dangerouslyReplaceNodeWithMarkup(...): Cannot render markup in a ' +

170 'worker thread. Make sure `window` and `document` are available ' +

171 'globally before requiring React when unit testing or use ' +

172 - 'React.renderComponentToString for server rendering.'

172 + 'React.renderToString for server rendering.'

173 );

174 invariant(markup, 'dangerouslyReplaceNodeWithMarkup(...): Missing markup.');

175 invariant(

src/browser/ui/dom/__tests__/CSSPropertyOperations-test.js

+4 -4

@@ -100,7 +100,7 @@ describe('CSSPropertyOperations', function() {

100 };

101 var div = <div style={styles} />;

102 var root = document.createElement('div');

103 - div = React.renderComponent(div, root);

103 + div = React.render(div, root);

104 expect(/style=".*"/.test(root.innerHTML)).toBe(true);

105 });

106

@@ -111,7 +111,7 @@ describe('CSSPropertyOperations', function() {

111 };

112 var div = <div style={styles} />;

113 var root = document.createElement('div');

114 - React.renderComponent(div, root);

114 + React.render(div, root);

115 expect(/style=".*"/.test(root.innerHTML)).toBe(false);

116 });

117

@@ -135,8 +135,8 @@ describe('CSSPropertyOperations', function() {

135 '-webkit-transform': 'translate3d(0, 0, 0)'

136 };

137

138 - React.renderComponent(<div />, root);

139 - React.renderComponent(<div style={styles} />, root);

138 + React.render(<div />, root);

139 + React.render(<div style={styles} />, root);

140

141 expect(console.warn.argsForCall.length).toBe(2);

142 expect(console.warn.argsForCall[0][0]).toContain('msTransform');

src/browser/ui/dom/components/__tests__/ReactDOMInput-test.js

+21 -21

@@ -206,7 +206,7 @@ describe('ReactDOMInput', function() {

206 var link = new ReactLink('yolo', mocks.getMockFunction());

207 var instance = <input type="text" valueLink={link} />;

208

209 - instance = React.renderComponent(instance, container);

209 + instance = React.render(instance, container);

210

211 expect(instance.getDOMNode().value).toBe('yolo');

212 expect(link.value).toBe('yolo');

@@ -226,25 +226,25 @@ describe('ReactDOMInput', function() {

226

227 var node = document.createElement('div');

228 var link = new ReactLink('yolo', mocks.getMockFunction());

229 - React.renderComponent(<input type="text" valueLink={link} />, node);

229 + React.render(<input type="text" valueLink={link} />, node);

230 expect(console.warn.mock.calls.length).toBe(0);

231

232 - React.renderComponent(

232 + React.render(

233 <input type="text" value="zoink" onChange={mocks.getMockFunction()} />,

234 node

235 );

236 expect(console.warn.mock.calls.length).toBe(0);

237

238 - React.renderComponent(

238 + React.render(

239 <input type="text" value="zoink" readOnly={true} />,

240 node

241 );

242 expect(console.warn.mock.calls.length).toBe(0);

243

244 - React.renderComponent(<input type="text" value="zoink" />, node);

244 + React.render(<input type="text" value="zoink" />, node);

245 expect(console.warn.mock.calls.length).toBe(1);

246

247 - React.renderComponent(

247 + React.render(

248 <input type="text" value="zoink" readOnly={false} />,

249 node

250 );

@@ -264,7 +264,7 @@ describe('ReactDOMInput', function() {

264 var link = new ReactLink('yolo', mocks.getMockFunction());

265 var instance = <input type="text" valueLink={link} />;

266

267 - expect(React.renderComponent.bind(React, instance, node)).not.toThrow();

267 + expect(React.render.bind(React, instance, node)).not.toThrow();

268

269 instance =

270 <input

@@ -273,10 +273,10 @@ describe('ReactDOMInput', function() {

273 value="test"

274 onChange={emptyFunction}

275 />;

276 - expect(React.renderComponent.bind(React, instance, node)).toThrow();

276 + expect(React.render.bind(React, instance, node)).toThrow();

277

278 instance = <input type="text" valueLink={link} onChange={emptyFunction} />;

279 - expect(React.renderComponent.bind(React, instance, node)).toThrow();

279 + expect(React.render.bind(React, instance, node)).toThrow();

280

281 });

282

@@ -285,7 +285,7 @@ describe('ReactDOMInput', function() {

285 var link = new ReactLink(true, mocks.getMockFunction());

286 var instance = <input type="checkbox" checkedLink={link} />;

287

288 - instance = React.renderComponent(instance, container);

288 + instance = React.render(instance, container);

289

290 expect(instance.getDOMNode().checked).toBe(true);

291 expect(link.value).toBe(true);

@@ -305,10 +305,10 @@ describe('ReactDOMInput', function() {

305

306 var node = document.createElement('div');

307 var link = new ReactLink(true, mocks.getMockFunction());

308 - React.renderComponent(<input type="checkbox" checkedLink={link} />, node);

308 + React.render(<input type="checkbox" checkedLink={link} />, node);

309 expect(console.warn.mock.calls.length).toBe(0);

310

311 - React.renderComponent(

311 + React.render(

312 <input

313 type="checkbox"

314 checked="false"

@@ -318,16 +318,16 @@ describe('ReactDOMInput', function() {

318 );

319 expect(console.warn.mock.calls.length).toBe(0);

320

321 - React.renderComponent(

321 + React.render(

322 <input type="checkbox" checked="false" readOnly={true} />,

323 node

324 );

325 expect(console.warn.mock.calls.length).toBe(0);

326

327 - React.renderComponent(<input type="checkbox" checked="false" />, node);

327 + React.render(<input type="checkbox" checked="false" />, node);

328 expect(console.warn.mock.calls.length).toBe(1);

329

330 - React.renderComponent(

330 + React.render(

331 <input type="checkbox" checked="false" readOnly={false} />,

332 node

333 );

@@ -347,7 +347,7 @@ describe('ReactDOMInput', function() {

347 var link = new ReactLink(true, mocks.getMockFunction());

348 var instance = <input type="checkbox" checkedLink={link} />;

349

350 - expect(React.renderComponent.bind(React, instance, node)).not.toThrow();

350 + expect(React.render.bind(React, instance, node)).not.toThrow();

351

352 instance =

353 <input

@@ -356,11 +356,11 @@ describe('ReactDOMInput', function() {

356 checked="false"

357 onChange={emptyFunction}

358 />;

359 - expect(React.renderComponent.bind(React, instance, node)).toThrow();

359 + expect(React.render.bind(React, instance, node)).toThrow();

360

361 instance =

362 <input type="checkbox" checkedLink={link} onChange={emptyFunction} />;

363 - expect(React.renderComponent.bind(React, instance, node)).toThrow();

363 + expect(React.render.bind(React, instance, node)).toThrow();

364

365 });

366

@@ -374,13 +374,13 @@ describe('ReactDOMInput', function() {

374 var link = new ReactLink(true, mocks.getMockFunction());

375 var instance = <input type="checkbox" checkedLink={link} />;

376

377 - expect(React.renderComponent.bind(React, instance, node)).not.toThrow();

377 + expect(React.render.bind(React, instance, node)).not.toThrow();

378

379 instance = <input type="checkbox" valueLink={link} />;

380 - expect(React.renderComponent.bind(React, instance, node)).not.toThrow();

380 + expect(React.render.bind(React, instance, node)).not.toThrow();

381

382 instance =

383 <input type="checkbox" checkedLink={link} valueLink={emptyFunction} />;

384 - expect(React.renderComponent.bind(React, instance, node)).toThrow();

384 + expect(React.render.bind(React, instance, node)).toThrow();

385 });

386 });

src/browser/ui/dom/components/__tests__/ReactDOMTextarea-test.js

+1 -1

@@ -226,7 +226,7 @@ describe('ReactDOMTextarea', function() {

226 var link = new ReactLink('yolo', mocks.getMockFunction());

227 var instance = <textarea valueLink={link} />;

228

229 - instance = React.renderComponent(instance, container);

229 + instance = React.render(instance, container);

230

231 expect(instance.getDOMNode().value).toBe('yolo');

232 expect(link.value).toBe('yolo');

src/core/ReactComponent.js

+1 -1

@@ -380,7 +380,7 @@ var ReactComponent = {

380 * @param {boolean} shouldReuseMarkup If true, do not insert markup

381 * @final

382 * @internal

383 - * @see {ReactMount.renderComponent}

383 + * @see {ReactMount.render}

384 */

385 mountComponentIntoNode: function(rootID, container, shouldReuseMarkup) {

386 var transaction = ReactUpdates.ReactReconcileTransaction.getPooled();

src/core/__tests__/ReactComponent-test.js

+2 -2

@@ -34,14 +34,14 @@ describe('ReactComponent', function() {

34 var container = document.createElement('div');

35 // jQuery objects are basically arrays; people often pass them in by mistake

36 expect(function() {

37 - React.renderComponent(<div></div>, [container]);

37 + React.render(<div></div>, [container]);

38 }).toThrow(

39 'Invariant Violation: _registerComponent(...): Target container ' +

40 'is not a DOM element.'

41 );

43 expect(function() {

44 - React.renderComponent(<div></div>, null);

44 + React.render(<div></div>, null);

45 }).toThrow(

46 'Invariant Violation: _registerComponent(...): Target container ' +

47 'is not a DOM element.'

src/core/__tests__/ReactComponentLifeCycle-test.js

+4 -4

@@ -103,9 +103,9 @@ describe('ReactComponentLifeCycle', function() {

103 }

104 });

105 var element = <StatefulComponent />;

106 - var firstInstance = React.renderComponent(element, container);

106 + var firstInstance = React.render(element, container);

107 React.unmountComponentAtNode(container);

108 - var secondInstance = React.renderComponent(element, container);

108 + var secondInstance = React.render(element, container);

109 expect(firstInstance).not.toBe(secondInstance);

110 });

111

@@ -398,7 +398,7 @@ describe('ReactComponentLifeCycle', function() {

398 updateTooltip: function() {

399 // Even though this.props.tooltip has an owner, updating it shouldn't

400 // throw here because it's mounted as a root component

401 - React.renderComponent(this.props.tooltip, this.container);

401 + React.render(this.props.tooltip, this.container);

402 }

403 });

404 var Component = React.createClass({

@@ -414,7 +414,7 @@ describe('ReactComponentLifeCycle', function() {

414 });

415

416 var container = document.createElement('div');

417 - var instance = React.renderComponent(

417 + var instance = React.render(

418 <Component text="uno" tooltipText="one" />,

419 container

420 );

src/core/__tests__/ReactCompositeComponent-test.js

+6 -6

@@ -299,12 +299,12 @@ describe('ReactCompositeComponent', function() {

299 }

300 });

301

302 - var markup = ReactServerRendering.renderComponentToString(<Parent />);

302 + var markup = ReactServerRendering.renderToString(<Parent />);

303 var container = document.createElement('div');

304 container.innerHTML = markup;

305

306 spyOn(console, 'warn');

307 - React.renderComponent(<Parent />, container);

307 + React.render(<Parent />, container);

308 expect(console.warn).not.toHaveBeenCalled();

309 });

310

@@ -468,13 +468,13 @@ describe('ReactCompositeComponent', function() {

468 });

469

470 var container = document.createElement('div');

471 - var instance = React.renderComponent(

471 + var instance = React.render(

472 <Component fruit="mango" />,

473 container

474 );

475 expect(instance.props.fruit).toBe('mango');

476

477 - React.renderComponent(<Component />, container);

477 + React.render(<Component />, container);

478 expect(instance.props.fruit).toBe('persimmon');

479 });

480

@@ -616,7 +616,7 @@ describe('ReactCompositeComponent', function() {

616 var instance = <Component />;

617 expect(instance.forceUpdate).not.toBeDefined();

618

619 - instance = React.renderComponent(instance, container);

619 + instance = React.render(instance, container);

620 expect(function() {

621 instance.forceUpdate();

622 }).not.toThrow();

@@ -876,7 +876,7 @@ describe('ReactCompositeComponent', function() {

876 }

877 });

878

879 - React.renderComponent(<Component />, container);

879 + React.render(<Component />, container);

880 React.unmountComponentAtNode(container);

881 expect(innerUnmounted).toBe(true);

882

src/core/__tests__/ReactIdentity-test.js

+9 -9

@@ -51,7 +51,7 @@ describe('ReactIdentity', function() {

51 }}

52 </div>;

54 - instance = React.renderComponent(instance, document.createElement('div'));

54 + instance = React.render(instance, document.createElement('div'));

55 var node = instance.getDOMNode();

56 reactComponentExpect(instance).toBeDOMComponentWithChildCount(2);

57 checkId(node.childNodes[0], '.0.$first:0');

@@ -67,7 +67,7 @@ describe('ReactIdentity', function() {

67 <div key={123} />

68 </div>;

70 - instance = React.renderComponent(instance, document.createElement('div'));

70 + instance = React.render(instance, document.createElement('div'));

71 var node = instance.getDOMNode();

72 reactComponentExpect(instance).toBeDOMComponentWithChildCount(4);

73 checkId(node.childNodes[0], '.0.$apple');

@@ -91,7 +91,7 @@ describe('ReactIdentity', function() {

91 <Wrapper><span key="chipmunk" /></Wrapper>

92 </div>;

94 - instance = React.renderComponent(instance, document.createElement('div'));

94 + instance = React.render(instance, document.createElement('div'));

95 var node = instance.getDOMNode();

96 reactComponentExpect(instance).toBeDOMComponentWithChildCount(3);

@@ -118,7 +118,7 @@ describe('ReactIdentity', function() {

118

119 });

120

121 - var instance = React.renderComponent(<Wrapper />, container);

121 + var instance = React.render(<Wrapper />, container);

122 var span1 = instance.refs.span1;

123 var span2 = instance.refs.span2;

124

@@ -189,7 +189,7 @@ describe('ReactIdentity', function() {

189

190 expect(function() {

191

192 - React.renderComponent(<TestContainer />, document.createElement('div'));

192 + React.render(<TestContainer />, document.createElement('div'));

193

194 }).not.toThrow();

195 });

@@ -225,7 +225,7 @@ describe('ReactIdentity', function() {

225

226 expect(function() {

227

228 - React.renderComponent(<TestContainer />, document.createElement('div'));

228 + React.render(<TestContainer />, document.createElement('div'));

229

230 }).not.toThrow();

231 });

@@ -252,7 +252,7 @@ describe('ReactIdentity', function() {

252

253 expect(function() {

254

255 - React.renderComponent(<TestContainer />, document.createElement('div'));

255 + React.render(<TestContainer />, document.createElement('div'));

256

257 }).not.toThrow();

258 });

@@ -291,7 +291,7 @@ describe('ReactIdentity', function() {

291

292 var wrapped = <TestContainer first={instance0} second={instance1} />;

293

294 - wrapped = React.renderComponent(wrapped, document.createElement('div'));

294 + wrapped = React.render(wrapped, document.createElement('div'));

295

296 var beforeID = ReactMount.getID(wrapped.getDOMNode().firstChild);

297

@@ -311,7 +311,7 @@ describe('ReactIdentity', function() {

311 </div>;

312

313 expect(function() {

314 - React.renderComponent(component, document.createElement('div'));

314 + React.render(component, document.createElement('div'));

315 }).not.toThrow();

316 });

317

src/core/__tests__/ReactMultiChild-test.js

+11 -11

@@ -49,13 +49,13 @@ describe('ReactMultiChild', function() {

49 expect(mockUpdate.mock.calls.length).toBe(0);

50 expect(mockUnmount.mock.calls.length).toBe(0);

52 - React.renderComponent(<div><MockComponent /></div>, container);

52 + React.render(<div><MockComponent /></div>, container);

54 expect(mockMount.mock.calls.length).toBe(1);

55 expect(mockUpdate.mock.calls.length).toBe(0);

56 expect(mockUnmount.mock.calls.length).toBe(0);

58 - React.renderComponent(<div><MockComponent /></div>, container);

58 + React.render(<div><MockComponent /></div>, container);

60 expect(mockMount.mock.calls.length).toBe(1);

61 expect(mockUpdate.mock.calls.length).toBe(1);

@@ -79,12 +79,12 @@ describe('ReactMultiChild', function() {

79 expect(mockMount.mock.calls.length).toBe(0);

80 expect(mockUnmount.mock.calls.length).toBe(0);

82 - React.renderComponent(<div><MockComponent /></div>, container);

82 + React.render(<div><MockComponent /></div>, container);

84 expect(mockMount.mock.calls.length).toBe(1);

85 expect(mockUnmount.mock.calls.length).toBe(0);

87 - React.renderComponent(<div><span /></div>, container);

87 + React.render(<div><span /></div>, container);

89 expect(mockMount.mock.calls.length).toBe(1);

90 expect(mockUnmount.mock.calls.length).toBe(1);

@@ -113,12 +113,12 @@ describe('ReactMultiChild', function() {

113 expect(mockMount.mock.calls.length).toBe(0);

114 expect(mockUnmount.mock.calls.length).toBe(0);

115

116 - React.renderComponent(<WrapperComponent />, container);

116 + React.render(<WrapperComponent />, container);

117

118 expect(mockMount.mock.calls.length).toBe(1);

119 expect(mockUnmount.mock.calls.length).toBe(0);

120

121 - React.renderComponent(

121 + React.render(

122 <WrapperComponent><MockComponent /></WrapperComponent>,

123 container

124 );

@@ -144,12 +144,12 @@ describe('ReactMultiChild', function() {

144 expect(mockMount.mock.calls.length).toBe(0);

145 expect(mockUnmount.mock.calls.length).toBe(0);

146

147 - React.renderComponent(<div><MockComponent key="A" /></div>, container);

147 + React.render(<div><MockComponent key="A" /></div>, container);

148

149 expect(mockMount.mock.calls.length).toBe(1);

150 expect(mockUnmount.mock.calls.length).toBe(0);

151

152 - React.renderComponent(<div><MockComponent key="B" /></div>, container);

152 + React.render(<div><MockComponent key="B" /></div>, container);

153

154 expect(mockMount.mock.calls.length).toBe(2);

155 expect(mockUnmount.mock.calls.length).toBe(1);

@@ -179,7 +179,7 @@ describe('ReactMultiChild', function() {

179 it('should only set `innerHTML` once on update', function() {

180 var container = document.createElement('div');

181

182 - React.renderComponent(

182 + React.render(

183 <div>

184 <p><span /></p>

185 <p><span /></p>

@@ -188,7 +188,7 @@ describe('ReactMultiChild', function() {

188 container

189 );

190 // Warm the cache used by `getMarkupWrap`.

191 - React.renderComponent(

191 + React.render(

192 <div>

193 <p><span /><span /></p>

194 <p><span /><span /></p>

@@ -199,7 +199,7 @@ describe('ReactMultiChild', function() {

199 expect(setInnerHTML).toHaveBeenCalled();

200 var callCountOnMount = setInnerHTML.callCount;

201

202 - React.renderComponent(

202 + React.render(

203 <div>

204 <p><span /><span /><span /></p>

205 <p><span /><span /><span /></p>

src/core/__tests__/ReactMultiChildText-test.js

+6 -6

@@ -223,22 +223,22 @@ describe('ReactMultiChildText', function() {

223

224 it('should render between nested components and inline children', function() {

225 var container = document.createElement('div');

226 - React.renderComponent(<div><h1><span /><span /></h1></div>, container);

226 + React.render(<div><h1><span /><span /></h1></div>, container);

227

228 expect(function() {

229 - React.renderComponent(<div><h1>A</h1></div>, container);

229 + React.render(<div><h1>A</h1></div>, container);

230 }).not.toThrow();

231

232 - React.renderComponent(<div><h1><span /><span /></h1></div>, container);

232 + React.render(<div><h1><span /><span /></h1></div>, container);

233

234 expect(function() {

235 - React.renderComponent(<div><h1>{['A']}</h1></div>, container);

235 + React.render(<div><h1>{['A']}</h1></div>, container);

236 }).not.toThrow();

237

238 - React.renderComponent(<div><h1><span /><span /></h1></div>, container);

238 + React.render(<div><h1><span /><span /></h1></div>, container);

239

240 expect(function() {

241 - React.renderComponent(<div><h1>{['A', 'B']}</h1></div>, container);

241 + React.render(<div><h1>{['A', 'B']}</h1></div>, container);

242 }).not.toThrow();

243 });

244 });

src/core/__tests__/ReactTextComponent-test.js

+1 -1

@@ -29,7 +29,7 @@ describe('ReactTextComponent', function() {

29 var ThisThingShouldBeEscaped = '">>> LULZ <<<"';

30 var ThisThingWasBeEscaped = '">>> LULZ <<<"';

31 var thing = <div><span key={ThisThingShouldBeEscaped}>LULZ</span></div>;

32 - var html = React.renderComponentToString(thing);

32 + var html = React.renderToString(thing);

33 expect(html).not.toContain(ThisThingShouldBeEscaped);

34 expect(html).toContain(ThisThingWasBeEscaped);

35 })

src/core/__tests__/ReactUpdates-test.js

+8 -8

@@ -508,16 +508,16 @@ describe('ReactUpdates', function() {

508

509 // Initial renders aren't batched together yet...

510 ReactUpdates.batchedUpdates(function() {

511 - React.renderComponent(<Component text="A1" />, containerA);

512 - React.renderComponent(<Component text="B1" />, containerB);

511 + React.render(<Component text="A1" />, containerA);

512 + React.render(<Component text="B1" />, containerB);

513 });

514 expect(ReconcileTransaction.getPooled.calls.length).toBe(2);

515

516 // ...but updates are! Here only one more transaction is used, which means

517 // we only have to initialize and close the wrappers once.

518 ReactUpdates.batchedUpdates(function() {

519 - React.renderComponent(<Component text="A2" />, containerA);

520 - React.renderComponent(<Component text="B2" />, containerB);

519 + React.render(<Component text="A2" />, containerA);

520 + React.render(<Component text="B2" />, containerB);

521 });

522 expect(ReconcileTransaction.getPooled.calls.length).toBe(3);

523 });

@@ -743,8 +743,8 @@ describe('ReactUpdates', function() {

743 });

744

745 var container = document.createElement('div');

746 - React.renderComponent(<A x={1} />, container);

747 - React.renderComponent(<A x={2} />, container);

746 + React.render(<A x={1} />, container);

747 + React.render(<A x={2} />, container);

748 expect(callbackCount).toBe(1);

749 });

750

@@ -769,7 +769,7 @@ describe('ReactUpdates', function() {

769 });

770

771 var container = document.createElement('div');

772 - var component = React.renderComponent(<A />, container);

772 + var component = React.render(<A />, container);

773 component.forceUpdate();

774 expect(callbackCount).toBe(2);

775 });

@@ -803,7 +803,7 @@ describe('ReactUpdates', function() {

803 });

804

805 var container = document.createElement('div');

806 - var component = React.renderComponent(<A />, container);

806 + var component = React.render(<A />, container);

807 component.setState({updates: 1});

808 expect(log).toEqual([

809 'render-0',

src/test/ReactTestUtils.js

+1 -1

@@ -50,7 +50,7 @@ var ReactTestUtils = {

50 // clean up, so we're going to stop honoring the name of this method

51 // (and probably rename it eventually) if no problems arise.

52 // document.documentElement.appendChild(div);

53 - return React.renderComponent(instance, div);

53 + return React.render(instance, div);

54 },

56 isElement: function(element) {

src/test/createHierarchyRenderer.js

+1 -1

@@ -38,7 +38,7 @@ var React = require('React');

38 *

39 * var instances = renderHierarchy(

40 * function(ComponentA[, ComponentB, ComponentC]) {

41 - * React.renderComponent(<ComponentA />, ...);

41 + * React.render(<ComponentA />, ...);

42 * })

43 * );

44 * instances[0][0]; // First return value of first render method.