Sync out latest changes

reactjs · Oct 9, 2015 · 5a9b886 · 5a9b886
1 parent c970cd4
commit 5a9b886
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/scripts/jest/preprocessor.js b/scripts/jest/preprocessor.js
@@ -10,6 +10,7 @@ var babelOpts = {
   plugins: [babelPluginModules],
   _moduleMap: {
     'React': 'react',
+    'ReactDOM': 'react-dom',
   }
 };
 

diff --git a/src/StaticContainer.react.js b/src/StaticContainer.react.js
@@ -34,7 +34,7 @@ class StaticContainer extends React.Component {
     return !!nextProps.shouldUpdate;
   }
 
-  render() {
+  render(): ?ReactElement {
     var child = this.props.children;
     if (child === null || child === false) {
       return null;

diff --git a/src/__tests__/StaticContainer.react-test.js b/src/__tests__/StaticContainer.react-test.js
@@ -11,37 +11,35 @@
 
 jest.dontMock('StaticContainer.react');
 
-describe('StaticContainer', () => {
-  var React;
-  var StaticContainer;
+var React = require('React');
+var ReactDOM = require('ReactDOM');
+var StaticContainer = require('StaticContainer.react');
 
+describe('StaticContainer', () => {
   var container;
 
   beforeEach(() => {
     jest.resetModuleRegistry();
 
-    React = require('React');
-    StaticContainer = require('StaticContainer.react');
-
     container = document.createElement('div');
   });
 
   it('does not update static content', () => {
     var mockRender = jest.genMockFunction().mockReturnValue(<div />);
     var MyComponent = React.createClass({render: mockRender});
 
-    React.render(<StaticContainer><MyComponent /></StaticContainer>, container);
+    ReactDOM.render(<StaticContainer><MyComponent /></StaticContainer>, container);
 
     expect(mockRender.mock.calls.length).toBe(1);
 
-    React.render(<StaticContainer><MyComponent /></StaticContainer>, container);
+    ReactDOM.render(<StaticContainer><MyComponent /></StaticContainer>, container);
 
     expect(mockRender.mock.calls.length).toBe(1);
   });
 
   it('allows null children', () => {
     expect(() => {
-      React.render(
+      ReactDOM.render(
         <StaticContainer>{null}</StaticContainer>,
         container
       );
@@ -50,14 +48,14 @@ describe('StaticContainer', () => {
 
   it('requires exactly one child', () => {
     expect(() => {
-      React.render(<StaticContainer />, container);
+      ReactDOM.render(<StaticContainer />, container);
     }).toThrow(
       'Invariant Violation: ' +
       'onlyChild must be passed a children with exactly one child.'
     );
 
     expect(() => {
-      React.render(<StaticContainer><a /><a /></StaticContainer>, container);
+      ReactDOM.render(<StaticContainer><a /><a /></StaticContainer>, container);
     }).toThrow(
       'Invariant Violation: ' +
       'onlyChild must be passed a children with exactly one child.'