{"commit":{"subject":"Fiber SSR tests (#9846)","shortRevision":"b9ddd206f9","authorName":"Edvin Erikson","authorEmail":"edvinerikson@gmail.com","authoredAt":"2017-06-05T00:44:24+02:00","revision":"b9ddd206f95af4a42265874b73f3e31b97ab0fe6"},"body":"","files":[{"status":"M","path":"scripts\/fiber\/tests-passing.txt"},{"status":"M","path":"scripts\/rollup\/results.json"},{"status":"M","path":"src\/renderers\/dom\/shared\/__tests__\/ReactServerRendering-test.js"},{"status":"M","path":"src\/renderers\/shared\/server\/ReactServerRenderer.js"}],"patch":"diff --git a\/scripts\/fiber\/tests-passing.txt b\/scripts\/fiber\/tests-passing.txt\nindex 5ed7aa117f..401449172b 100644\n--- a\/scripts\/fiber\/tests-passing.txt\n+++ b\/scripts\/fiber\/tests-passing.txt\n@@ -1327,6 +1327,9 @@ src\/renderers\/dom\/shared\/__tests__\/ReactServerRendering-test.js\n * should only execute certain lifecycle methods\n * should throw with silly args\n * allows setState in componentWillMount without using DOM\n+* allows setState in componentWillMount with custom constructor\n+* renders with props when using custom constructor\n+* renders with context when using custom constructor\n * renders components with different batching strategies\n * warns with a no-op when an async setState is triggered\n * warns with a no-op when an async forceUpdate is triggered\ndiff --git a\/scripts\/rollup\/results.json b\/scripts\/rollup\/results.json\nindex 0787402e94..35deea083e 100644\n--- a\/scripts\/rollup\/results.json\n+++ b\/scripts\/rollup\/results.json\n@@ -9,28 +9,28 @@\n \"gzip\": 3089\n },\n \"react-dom.development.js (UMD_DEV)\": {\n- \"size\": 605435,\n- \"gzip\": 139358\n+ \"size\": 603820,\n+ \"gzip\": 138900\n },\n \"react-dom.production.min.js (UMD_PROD)\": {\n- \"size\": 125246,\n- \"gzip\": 39624\n+ \"size\": 124927,\n+ \"gzip\": 39493\n },\n \"react-dom-server.development.js (UMD_DEV)\": {\n- \"size\": 534438,\n- \"gzip\": 129160\n+ \"size\": 532325,\n+ \"gzip\": 128572\n },\n \"react-dom-server.production.min.js (UMD_PROD)\": {\n- \"size\": 113386,\n- \"gzip\": 35642\n+ \"size\": 112876,\n+ \"gzip\": 35439\n },\n \"react-art.development.js (UMD_DEV)\": {\n- \"size\": 359125,\n- \"gzip\": 79859\n+ \"size\": 358834,\n+ \"gzip\": 79713\n },\n \"react-art.production.min.js (UMD_PROD)\": {\n- \"size\": 98612,\n- \"gzip\": 29993\n+ \"size\": 98607,\n+ \"gzip\": 29968\n },\n \"react.development.js (NODE_DEV)\": {\n \"size\": 64064,\n@@ -57,36 +57,36 @@\n \"gzip\": 86700\n },\n \"react-dom.development.js (NODE_DEV)\": {\n- \"size\": 563003,\n- \"gzip\": 129288\n+ \"size\": 562438,\n+ \"gzip\": 129053\n },\n \"react-dom.production.min.js (NODE_PROD)\": {\n- \"size\": 121459,\n- \"gzip\": 38279\n+ \"size\": 121292,\n+ \"gzip\": 38189\n },\n \"ReactDOMFiber-dev.js (FB_DEV)\": {\n- \"size\": 563992,\n- \"gzip\": 129811\n+ \"size\": 563608,\n+ \"gzip\": 129673\n },\n \"ReactDOMFiber-prod.js (FB_PROD)\": {\n- \"size\": 423415,\n- \"gzip\": 96616\n+ \"size\": 423197,\n+ \"gzip\": 96509\n },\n \"react-dom-server.development.js (NODE_DEV)\": {\n- \"size\": 482987,\n- \"gzip\": 116600\n+ \"size\": 481924,\n+ \"gzip\": 116242\n },\n \"react-dom-server.production.min.js (NODE_PROD)\": {\n- \"size\": 107761,\n- \"gzip\": 33495\n+ \"size\": 107403,\n+ \"gzip\": 33347\n },\n \"ReactDOMServerStack-dev.js (FB_DEV)\": {\n- \"size\": 464469,\n- \"gzip\": 112326\n+ \"size\": 463581,\n+ \"gzip\": 112069\n },\n \"ReactDOMServerStack-prod.js (FB_PROD)\": {\n- \"size\": 341137,\n- \"gzip\": 82395\n+ \"size\": 340301,\n+ \"gzip\": 82162\n },\n \"ReactARTStack-dev.js (FB_DEV)\": {\n \"size\": 143177,\n@@ -97,20 +97,20 @@\n \"gzip\": 23049\n },\n \"react-art.development.js (NODE_DEV)\": {\n- \"size\": 280466,\n- \"gzip\": 59782\n+ \"size\": 280175,\n+ \"gzip\": 59621\n },\n \"react-art.production.min.js (NODE_PROD)\": {\n- \"size\": 59997,\n- \"gzip\": 18059\n+ \"size\": 59992,\n+ \"gzip\": 18043\n },\n \"ReactARTFiber-dev.js (FB_DEV)\": {\n- \"size\": 279735,\n- \"gzip\": 59621\n+ \"size\": 279625,\n+ \"gzip\": 59561\n },\n \"ReactARTFiber-prod.js (FB_PROD)\": {\n- \"size\": 217307,\n- \"gzip\": 45335\n+ \"size\": 217340,\n+ \"gzip\": 45300\n },\n \"ReactNativeStack.js (RN)\": {\n \"size\": 233993,\n@@ -121,20 +121,20 @@\n \"gzip\": 84001\n },\n \"ReactTestRendererFiber-dev.js (FB_DEV)\": {\n- \"size\": 277216,\n- \"gzip\": 58480\n+ \"size\": 277109,\n+ \"gzip\": 58420\n },\n \"ReactTestRendererStack-dev.js (FB_DEV)\": {\n- \"size\": 151781,\n- \"gzip\": 34856\n+ \"size\": 151247,\n+ \"gzip\": 34719\n },\n \"react-noop-renderer.development.js (NODE_DEV)\": {\n- \"size\": 269122,\n- \"gzip\": 56410\n+ \"size\": 268831,\n+ \"gzip\": 56248\n },\n \"react-test-renderer.development.js (NODE_DEV)\": {\n- \"size\": 277956,\n- \"gzip\": 58660\n+ \"size\": 277668,\n+ \"gzip\": 58491\n },\n \"react-dom-test-utils.development.js (NODE_DEV)\": {\n \"size\": 52792,\n@@ -145,8 +145,8 @@\n \"gzip\": 13574\n },\n \"react-test-renderer-stack.development.js (NODE_DEV)\": {\n- \"size\": 152686,\n- \"gzip\": 35015\n+ \"size\": 151979,\n+ \"gzip\": 34761\n },\n \"react-test-renderer-shallow.development.js (NODE_DEV)\": {\n \"size\": 8108,\n@@ -157,28 +157,28 @@\n \"gzip\": 2234\n },\n \"ReactDOMServerStream-dev.js (FB_DEV)\": {\n- \"size\": 481456,\n- \"gzip\": 116430\n+ \"size\": 480568,\n+ \"gzip\": 116171\n },\n \"ReactDOMServerStream-prod.js (FB_PROD)\": {\n- \"size\": 352294,\n- \"gzip\": 85249\n+ \"size\": 351458,\n+ \"gzip\": 85017\n },\n \"ReactNativeStack-dev.js (RN_DEV)\": {\n- \"size\": 182421,\n- \"gzip\": 35496\n+ \"size\": 186098,\n+ \"gzip\": 35885\n },\n \"ReactNativeStack-prod.js (RN_PROD)\": {\n- \"size\": 134188,\n- \"gzip\": 25741\n+ \"size\": 137881,\n+ \"gzip\": 26310\n },\n \"ReactNativeFiber-dev.js (RN_DEV)\": {\n- \"size\": 278278,\n- \"gzip\": 50225\n+ \"size\": 282183,\n+ \"gzip\": 50630\n },\n \"ReactNativeFiber-prod.js (RN_PROD)\": {\n- \"size\": 216205,\n- \"gzip\": 37384\n+ \"size\": 220295,\n+ \"gzip\": 37795\n }\n }\n }\n\\ No newline at end of file\ndiff --git a\/src\/renderers\/dom\/shared\/__tests__\/ReactServerRendering-test.js b\/src\/renderers\/dom\/shared\/__tests__\/ReactServerRendering-test.js\nindex 93975911b6..638ff28e7b 100644\n--- a\/src\/renderers\/dom\/shared\/__tests__\/ReactServerRendering-test.js\n+++ b\/src\/renderers\/dom\/shared\/__tests__\/ReactServerRendering-test.js\n@@ -19,6 +19,7 @@ var ReactDOMServer;\n var ReactMarkupChecksum;\n var ReactReconcileTransaction;\n var ReactTestUtils;\n+var PropTypes;\n \n var ID_ATTRIBUTE_NAME;\n var ROOT_ATTRIBUTE_NAME;\n@@ -32,6 +33,7 @@ describe('ReactDOMServer', () => {\n ReactMarkupChecksum = require('ReactMarkupChecksum');\n ReactTestUtils = require('ReactTestUtils');\n ReactReconcileTransaction = require('ReactReconcileTransaction');\n+ PropTypes = require('prop-types');\n \n ExecutionEnvironment = require('fbjs\/lib\/ExecutionEnvironment');\n ExecutionEnvironment.canUseDOM = false;\n@@ -424,7 +426,85 @@ describe('ReactDOMServer', () => {\n throw new Error('Browser reconcile transaction should not be used');\n };\n var markup = ReactDOMServer.renderToString();\n- expect(markup.indexOf('hello, world') >= 0).toBe(true);\n+ expect(markup).toContain('hello, world');\n+ });\n+\n+ it('allows setState in componentWillMount with custom constructor', () => {\n+ class Component extends React.Component {\n+ constructor() {\n+ super();\n+ this.state = {text: 'default state'};\n+ }\n+\n+ componentWillMount() {\n+ this.setState({text: 'hello, world'});\n+ }\n+\n+ render() {\n+ return

{this.state.text}<\/div>;\n+ }\n+ }\n+\n+ ReactReconcileTransaction.prototype.perform = function() {\n+ \/\/ We shouldn't ever be calling this on the server\n+ throw new Error('Browser reconcile transaction should not be used');\n+ };\n+ var markup = ReactDOMServer.renderToString();\n+ expect(markup).toContain('hello, world');\n+ });\n+\n+ it('renders with props when using custom constructor', () => {\n+ class Component extends React.Component {\n+ constructor() {\n+ super();\n+ }\n+\n+ render() {\n+ return

{this.props.text}<\/div>;\n+ }\n+ }\n+\n+ var markup = ReactDOMServer.renderToString(\n+ ,\n+ );\n+ expect(markup).toContain('hello, world');\n+ });\n+\n+ it('renders with context when using custom constructor', () => {\n+ class Component extends React.Component {\n+ constructor() {\n+ super();\n+ }\n+\n+ render() {\n+ return

{this.context.text}<\/div>;\n+ }\n+ }\n+\n+ Component.contextTypes = {\n+ text: PropTypes.string.isRequired,\n+ };\n+\n+ class ContextProvider extends React.Component {\n+ getChildContext() {\n+ return {\n+ text: 'hello, world',\n+ };\n+ }\n+\n+ render() {\n+ return this.props.children;\n+ }\n+ }\n+\n+ ContextProvider.childContextTypes = {\n+ text: PropTypes.string,\n+ };\n+\n+ var markup = ReactDOMServer.renderToString(\n+ <\/ContextProvider>,\n+ );\n+ expect(markup).toContain('hello, world');\n });\n \n it('renders components with different batching strategies', () => {\ndiff --git a\/src\/renderers\/shared\/server\/ReactServerRenderer.js b\/src\/renderers\/shared\/server\/ReactServerRenderer.js\nindex db96d478c8..fc86b3bf2c 100644\n--- a\/src\/renderers\/shared\/server\/ReactServerRenderer.js\n+++ b\/src\/renderers\/shared\/server\/ReactServerRenderer.js\n@@ -278,6 +278,10 @@ function resolve(child, context) {\n }\n }\n \n+ inst.props = child.props;\n+ inst.context = publicContext;\n+ inst.updater = updater;\n+\n var initialState = inst.state;\n if (initialState === undefined) {\n inst.state = initialState = null;\n","parents":["28e89cfa2d3dff4aa85803bd7dce66814d626ee7"]}

dillon1000/react

Files changed