{"parents":["5c4362dc5c30357aed829e630ca4a03bd812e482"],"body":"This exposed a few more cases that I missed.","files":[{"status":"M","path":"scripts\/fiber\/tests-passing.txt"},{"status":"M","path":"scripts\/jest\/test-framework-setup.js"},{"status":"M","path":"src\/renderers\/dom\/fiber\/ReactDOMFiber.js"},{"status":"M","path":"src\/renderers\/dom\/fiber\/__tests__\/ReactDOMFiber-test.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/ReactChildFiber.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/__tests__\/ReactCoroutine-test.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/__tests__\/ReactIncremental-test.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalErrorHandling-test.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalReflection-test.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalScheduling-test.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalSideEffects-test.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalUpdates-test.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/__tests__\/ReactTopLevelFragment-test.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/__tests__\/ReactTopLevelText-test.js"},{"status":"M","path":"src\/renderers\/shared\/shared\/__tests__\/ReactEmptyComponent-test.js"},{"status":"M","path":"src\/renderers\/shared\/shared\/__tests__\/ReactStatelessComponent-test.js"},{"status":"M","path":"src\/renderers\/testing\/__tests__\/ReactTestRenderer-test.js"}],"patch":"diff --git a\/scripts\/fiber\/tests-passing.txt b\/scripts\/fiber\/tests-passing.txt\nindex 7f080729aa..050dd41e1b 100644\n--- a\/scripts\/fiber\/tests-passing.txt\n+++ b\/scripts\/fiber\/tests-passing.txt\n@@ -554,7 +554,6 @@ src\/renderers\/dom\/fiber\/__tests__\/ReactDOMFiber-test.js\n * should not crash encountering low-priority tree\n * throws if non-element passed to top-level render\n * throws if something other than false, null, or an element is returned from render\n-* still accepts arrays and iterables as host children\n \n src\/renderers\/dom\/shared\/__tests__\/CSSProperty-test.js\n * should generate browser prefixes for its `isUnitlessNumber`\ndiff --git a\/scripts\/jest\/test-framework-setup.js b\/scripts\/jest\/test-framework-setup.js\nindex 6128ed6ed8..dc8fd2fc7d 100644\n--- a\/scripts\/jest\/test-framework-setup.js\n+++ b\/scripts\/jest\/test-framework-setup.js\n@@ -9,6 +9,12 @@ jest.mock('ReactDOMFeatureFlags', () => {\n useFiber: flags.useFiber || !!process.env.REACT_DOM_JEST_USE_FIBER,\n });\n });\n+jest.mock('ReactFeatureFlags', () => {\n+ const flags = require.requireActual('ReactFeatureFlags');\n+ return Object.assign({}, flags, {\n+ disableNewFiberFeatures: true,\n+ });\n+});\n \n \/\/ Error logging varies between Fiber and Stack;\n \/\/ Rather than fork dozens of tests, mock the error-logging file by default.\ndiff --git a\/src\/renderers\/dom\/fiber\/ReactDOMFiber.js b\/src\/renderers\/dom\/fiber\/ReactDOMFiber.js\nindex 8a33133ad4..7045a874e1 100644\n--- a\/src\/renderers\/dom\/fiber\/ReactDOMFiber.js\n+++ b\/src\/renderers\/dom\/fiber\/ReactDOMFiber.js\n@@ -18,6 +18,7 @@ import type { ReactNodeList } from 'ReactTypes';\n var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');\n var ReactControlledComponent = require('ReactControlledComponent');\n var ReactDOMComponentTree = require('ReactDOMComponentTree');\n+var ReactFeatureFlags = require('ReactFeatureFlags');\n var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n var ReactDOMFiberComponent = require('ReactDOMFiberComponent');\n var ReactDOMFrameScheduling = require('ReactDOMFrameScheduling');\n@@ -27,6 +28,8 @@ var ReactFiberReconciler = require('ReactFiberReconciler');\n var ReactInputSelection = require('ReactInputSelection');\n var ReactInstanceMap = require('ReactInstanceMap');\n var ReactPortal = require('ReactPortal');\n+var { isValidElement } = require('ReactElement');\n+\n \n var findDOMNode = require('findDOMNode');\n var invariant = require('invariant');\n@@ -49,6 +52,7 @@ if (__DEV__) {\n var { updatedAncestorInfo } = validateDOMNesting;\n }\n \n+\n const DOCUMENT_NODE = 9;\n \n ReactDOMInjection.inject();\n@@ -352,6 +356,17 @@ var ReactDOM = {\n \n render(element : ReactElement, container : DOMContainerElement, callback: ?Function) {\n validateContainer(container);\n+\n+ if (ReactFeatureFlags.disableNewFiberFeatures) {\n+ \/\/ Top-level check occurs here instead of inside child reconciler because\n+ \/\/ because requirements vary between renderers. E.g. React Art\n+ \/\/ allows arrays.\n+ invariant(\n+ isValidElement(element),\n+ 'render(): Invalid component element.'\n+ );\n+ }\n+\n return renderSubtreeIntoContainer(null, element, container, callback);\n },\n \ndiff --git a\/src\/renderers\/dom\/fiber\/__tests__\/ReactDOMFiber-test.js b\/src\/renderers\/dom\/fiber\/__tests__\/ReactDOMFiber-test.js\nindex 7e23c864c9..a4238218c3 100644\n--- a\/src\/renderers\/dom\/fiber\/__tests__\/ReactDOMFiber-test.js\n+++ b\/src\/renderers\/dom\/fiber\/__tests__\/ReactDOMFiber-test.js\n@@ -18,9 +18,17 @@ var ReactTestUtils = require('ReactTestUtils');\n \n describe('ReactDOMFiber', () => {\n var container;\n+ var ReactFeatureFlags;\n \n beforeEach(() => {\n container = document.createElement('div');\n+ ReactFeatureFlags = require('ReactFeatureFlags');\n+ ReactFeatureFlags.disableNewFiberFeatures = false;\n+ });\n+\n+ afterEach(() => {\n+ ReactFeatureFlags = require('ReactFeatureFlags');\n+ ReactFeatureFlags.disableNewFiberFeatures = true;\n });\n \n it('should render strings as children', () => {\n@@ -1085,47 +1093,42 @@ describe('ReactDOMFiber', () => {\n container\n );\n });\n+ }\n+});\n \n- describe('disableNewFiberFeatures', () => {\n- var ReactFeatureFlags = require('ReactFeatureFlags');\n-\n- beforeEach(() => {\n- ReactFeatureFlags.disableNewFiberFeatures = true;\n- });\n+\/\/ disableNewFiberFeatures currently defaults to true in test\n+describe('disableNewFiberFeatures', () => {\n+ var container;\n+ var ReactFeatureFlags;\n \n- afterEach(() => {\n- ReactFeatureFlags.disableNewFiberFeatures = false;\n- });\n+ beforeEach(() => {\n+ container = document.createElement('div');\n+ ReactFeatureFlags = require('ReactFeatureFlags');\n+ ReactFeatureFlags.disableNewFiberFeatures = true;\n+ });\n \n- it('throws if non-element passed to top-level render', () => {\n- const message = 'render(): Invalid component element.';\n- expect(() => ReactDOM.render(null, container)).toThrow(message, container);\n- expect(() => ReactDOM.render(undefined, container)).toThrow(message, container);\n- expect(() => ReactDOM.render(false, container)).toThrow(message, container);\n- expect(() => ReactDOM.render('Hi', container)).toThrow(message, container);\n- expect(() => ReactDOM.render(999, container)).toThrow(message, container);\n- expect(() => ReactDOM.render([

], container)).toThrow(message, container);\n- });\n+ afterEach(() => {\n+ ReactFeatureFlags = require('ReactFeatureFlags');\n+ ReactFeatureFlags.disableNewFiberFeatures = false;\n+ });\n \n- it('throws if something other than false, null, or an element is returned from render', () => {\n- function Render(props) {\n- return props.children;\n- }\n+ it('throws if non-element passed to top-level render', () => {\n+ const message = 'render(): Invalid component element.';\n+ expect(() => ReactDOM.render(null, container)).toThrow(message, container);\n+ expect(() => ReactDOM.render(undefined, container)).toThrow(message, container);\n+ expect(() => ReactDOM.render(false, container)).toThrow(message, container);\n+ expect(() => ReactDOM.render('Hi', container)).toThrow(message, container);\n+ expect(() => ReactDOM.render(999, container)).toThrow(message, container);\n+ expect(() => ReactDOM.render([

], container)).toThrow(message, container);\n+ });\n \n- expect(() => ReactDOM.render(Hi<\/Render>, container)).toThrow(\/You may have returned undefined\/);\n- expect(() => ReactDOM.render({999}<\/Render>, container)).toThrow(\/You may have returned undefined\/);\n- expect(() => ReactDOM.render([

]<\/Render>, container)).toThrow(\/You may have returned undefined\/);\n- });\n+ it('throws if something other than false, null, or an element is returned from render', () => {\n+ function Render(props) {\n+ return props.children;\n+ }\n \n- it('still accepts arrays and iterables as host children', () => {\n- function Render(props) {\n- return

{props.children}<\/div>;\n- }\n- ReactDOM.render({['foo', 'bar']}<\/Render>, container);\n- expect(container.textContent).toEqual('foobar');\n- ReactDOM.render({new Set(['foo', 'bar'])}<\/Render>, container);\n- expect(container.textContent).toEqual('foobar');\n- });\n- });\n- }\n+ expect(() => ReactDOM.render(Hi<\/Render>, container)).toThrow(\/You may have returned undefined\/);\n+ expect(() => ReactDOM.render({999}<\/Render>, container)).toThrow(\/You may have returned undefined\/);\n+ expect(() => ReactDOM.render([

]<\/Render>, container)).toThrow(\/You may have returned undefined\/);\n+ });\n });\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactChildFiber.js b\/src\/renderers\/shared\/fiber\/ReactChildFiber.js\nindex 0a3ca1d4ec..8b0dcd1ade 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactChildFiber.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactChildFiber.js\n@@ -75,7 +75,6 @@ const {\n NoEffect,\n Placement,\n Deletion,\n- Err,\n } = ReactTypeOfSideEffect;\n \n function coerceRef(current: ?Fiber, element: ReactElement) {\n@@ -1127,41 +1126,40 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {\n }\n }\n \n- if (returnFiber.tag === HostRoot) {\n- \/\/ Top-level only accepts elements or portals\n- invariant(\n- \/\/ If the root has an error effect, this is an intentional unmount.\n- \/\/ Don't throw an error.\n- returnFiber.effectTag & Err,\n- 'render(): Invalid component element.'\n- );\n- } else {\n- switch (returnFiber.tag) {\n- case ClassComponent: {\n- if (__DEV__) {\n- const instance = returnFiber.stateNode;\n- if (instance.render._isMockFunction) {\n- \/\/ We allow auto-mocks to proceed as if they're\n- \/\/ returning null.\n- break;\n- }\n+ switch (returnFiber.tag) {\n+ case ClassComponent: {\n+ if (__DEV__) {\n+ const instance = returnFiber.stateNode;\n+ if (instance.render._isMockFunction) {\n+ \/\/ We allow auto-mocks to proceed as if they're\n+ \/\/ returning null.\n+ break;\n }\n }\n- \/\/ Intentionally fall through to the next case, which handles both\n- \/\/ functions and classes\n- \/\/ eslint-disable-next-lined no-fallthrough\n- case FunctionalComponent: {\n- \/\/ Composites accept elements, portals, null, or false\n- const Component = returnFiber.type;\n- invariant(\n- newChild === null || newChild === false,\n- '%s.render(): A valid React element (or null) must be ' +\n- 'returned. You may have returned undefined, an array or some ' +\n- 'other invalid object.',\n- Component.displayName || Component.name || 'Component'\n- );\n- }\n }\n+ \/\/ Intentionally fall through to the next case, which handles both\n+ \/\/ functions and classes\n+ \/\/ eslint-disable-next-lined no-fallthrough\n+ case FunctionalComponent: {\n+ \/\/ Composites accept elements, portals, null, or false\n+ const Component = returnFiber.type;\n+ invariant(\n+ newChild === null || newChild === false,\n+ '%s(...): A valid React element (or null) must be ' +\n+ 'returned. You may have returned undefined, an array or some ' +\n+ 'other invalid object.',\n+ Component.displayName || Component.name || 'Component'\n+ );\n+ }\n+ }\n+\n+ if (typeof newChild === 'string' || typeof newChild === 'number') {\n+ return placeSingleChild(reconcileSingleTextNode(\n+ returnFiber,\n+ currentFirstChild,\n+ '' + newChild,\n+ priority\n+ ));\n }\n \n if (isArray(newChild)) {\ndiff --git a\/src\/renderers\/shared\/fiber\/__tests__\/ReactCoroutine-test.js b\/src\/renderers\/shared\/fiber\/__tests__\/ReactCoroutine-test.js\nindex 232582b407..4ef55100b7 100644\n--- a\/src\/renderers\/shared\/fiber\/__tests__\/ReactCoroutine-test.js\n+++ b\/src\/renderers\/shared\/fiber\/__tests__\/ReactCoroutine-test.js\n@@ -14,6 +14,7 @@\n var React;\n var ReactNoop;\n var ReactCoroutine;\n+var ReactFeatureFlags;\n \n describe('ReactCoroutine', () => {\n beforeEach(() => {\n@@ -21,6 +22,8 @@ describe('ReactCoroutine', () => {\n React = require('React');\n ReactNoop = require('ReactNoop');\n ReactCoroutine = require('ReactCoroutine');\n+ ReactFeatureFlags = require('ReactFeatureFlags');\n+ ReactFeatureFlags.disableNewFiberFeatures = false;\n });\n \n it('should render a coroutine', () => {\ndiff --git a\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncremental-test.js b\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncremental-test.js\nindex 7c3783e742..d174efd221 100644\n--- a\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncremental-test.js\n+++ b\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncremental-test.js\n@@ -13,12 +13,16 @@\n \n var React;\n var ReactNoop;\n+var ReactFeatureFlags;\n \n describe('ReactIncremental', () => {\n beforeEach(() => {\n jest.resetModules();\n React = require('React');\n ReactNoop = require('ReactNoop');\n+\n+ ReactFeatureFlags = require('ReactFeatureFlags');\n+ ReactFeatureFlags.disableNewFiberFeatures = false;\n });\n \n it('should render a simple component', () => {\ndiff --git a\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalErrorHandling-test.js b\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalErrorHandling-test.js\nindex b3ef77c279..bef5a4b7b2 100644\n--- a\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalErrorHandling-test.js\n+++ b\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalErrorHandling-test.js\n@@ -13,12 +13,15 @@\n \n var React;\n var ReactNoop;\n+var ReactFeatureFlags;\n \n describe('ReactIncrementalErrorHandling', () => {\n beforeEach(() => {\n jest.resetModules();\n React = require('React');\n ReactNoop = require('ReactNoop');\n+ ReactFeatureFlags = require('ReactFeatureFlags');\n+ ReactFeatureFlags.disableNewFiberFeatures = false;\n });\n \n function div(...children) {\ndiff --git a\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalReflection-test.js b\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalReflection-test.js\nindex 6d4ff9d1ec..470d0e278c 100644\n--- a\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalReflection-test.js\n+++ b\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalReflection-test.js\n@@ -13,12 +13,15 @@\n \n var React;\n var ReactNoop;\n+var ReactFeatureFlags;\n \n describe('ReactIncrementalReflection', () => {\n beforeEach(() => {\n jest.resetModules();\n React = require('React');\n ReactNoop = require('ReactNoop');\n+ ReactFeatureFlags = require('ReactFeatureFlags');\n+ ReactFeatureFlags.disableNewFiberFeatures = false;\n });\n \n it('handles isMounted even when the initial render is deferred', () => {\ndiff --git a\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalScheduling-test.js b\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalScheduling-test.js\nindex 9a12abe4aa..c856f26380 100644\n--- a\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalScheduling-test.js\n+++ b\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalScheduling-test.js\n@@ -13,12 +13,15 @@\n \n var React;\n var ReactNoop;\n+var ReactFeatureFlags;\n \n describe('ReactIncrementalScheduling', () => {\n beforeEach(() => {\n jest.resetModules();\n React = require('React');\n ReactNoop = require('ReactNoop');\n+ ReactFeatureFlags = require('ReactFeatureFlags');\n+ ReactFeatureFlags.disableNewFiberFeatures = false;\n });\n \n function span(prop) {\ndiff --git a\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalSideEffects-test.js b\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalSideEffects-test.js\nindex f8b46fa186..15b51610e8 100644\n--- a\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalSideEffects-test.js\n+++ b\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalSideEffects-test.js\n@@ -13,12 +13,15 @@\n \n var React;\n var ReactNoop;\n+var ReactFeatureFlags;\n \n describe('ReactIncrementalSideEffects', () => {\n beforeEach(() => {\n jest.resetModules();\n React = require('React');\n ReactNoop = require('ReactNoop');\n+ ReactFeatureFlags = require('ReactFeatureFlags');\n+ ReactFeatureFlags.disableNewFiberFeatures = false;\n });\n \n function normalizeCodeLocInfo(str) {\ndiff --git a\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalUpdates-test.js b\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalUpdates-test.js\nindex 73f97d3db1..9953c8db81 100644\n--- a\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalUpdates-test.js\n+++ b\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalUpdates-test.js\n@@ -13,12 +13,15 @@\n \n var React;\n var ReactNoop;\n+var ReactFeatureFlags;\n \n describe('ReactIncrementalUpdates', () => {\n beforeEach(() => {\n jest.resetModuleRegistry();\n React = require('React');\n ReactNoop = require('ReactNoop');\n+ ReactFeatureFlags = require('ReactFeatureFlags');\n+ ReactFeatureFlags.disableNewFiberFeatures = false;\n });\n \n it('applies updates in order of priority', () => {\ndiff --git a\/src\/renderers\/shared\/fiber\/__tests__\/ReactTopLevelFragment-test.js b\/src\/renderers\/shared\/fiber\/__tests__\/ReactTopLevelFragment-test.js\nindex eaff644476..04004e46a2 100644\n--- a\/src\/renderers\/shared\/fiber\/__tests__\/ReactTopLevelFragment-test.js\n+++ b\/src\/renderers\/shared\/fiber\/__tests__\/ReactTopLevelFragment-test.js\n@@ -13,6 +13,7 @@\n \n var React;\n var ReactNoop;\n+var ReactFeatureFlags;\n \n \/\/ This is a new feature in Fiber so I put it in its own test file. It could\n \/\/ probably move to one of the other test files once it is official.\n@@ -21,6 +22,8 @@ describe('ReactTopLevelFragment', function() {\n jest.resetModules();\n React = require('React');\n ReactNoop = require('ReactNoop');\n+ ReactFeatureFlags = require('ReactFeatureFlags');\n+ ReactFeatureFlags.disableNewFiberFeatures = false;\n });\n \n it('should render a simple fragment at the top of a component', function() {\ndiff --git a\/src\/renderers\/shared\/fiber\/__tests__\/ReactTopLevelText-test.js b\/src\/renderers\/shared\/fiber\/__tests__\/ReactTopLevelText-test.js\nindex 63677123f3..84a98da730 100644\n--- a\/src\/renderers\/shared\/fiber\/__tests__\/ReactTopLevelText-test.js\n+++ b\/src\/renderers\/shared\/fiber\/__tests__\/ReactTopLevelText-test.js\n@@ -13,6 +13,7 @@\n \n var React;\n var ReactNoop;\n+var ReactFeatureFlags;\n \n \/\/ This is a new feature in Fiber so I put it in its own test file. It could\n \/\/ probably move to one of the other test files once it is official.\n@@ -21,6 +22,8 @@ describe('ReactTopLevelText', () => {\n jest.resetModules();\n React = require('React');\n ReactNoop = require('ReactNoop');\n+ ReactFeatureFlags = require('ReactFeatureFlags');\n+ ReactFeatureFlags.disableNewFiberFeatures = false;\n });\n \n it('should render a component returning strings directly from render', () => {\ndiff --git a\/src\/renderers\/shared\/shared\/__tests__\/ReactEmptyComponent-test.js b\/src\/renderers\/shared\/shared\/__tests__\/ReactEmptyComponent-test.js\nindex 69e74fd211..ac2c884ec9 100644\n--- a\/src\/renderers\/shared\/shared\/__tests__\/ReactEmptyComponent-test.js\n+++ b\/src\/renderers\/shared\/shared\/__tests__\/ReactEmptyComponent-test.js\n@@ -247,18 +247,24 @@ describe('ReactEmptyComponent', () => {\n });\n \n it('can render null at the top level', () => {\n+ var ReactFeatureFlags = require('ReactFeatureFlags');\n+ ReactFeatureFlags.disableNewFiberFeatures = false;\n var div = document.createElement('div');\n \n- if (ReactDOMFeatureFlags.useFiber) {\n- ReactDOM.render(null, div);\n- expect(div.innerHTML).toBe('');\n- } else {\n- \/\/ Stack does not implement this.\n- expect(function() {\n+ try {\n+ if (ReactDOMFeatureFlags.useFiber) {\n ReactDOM.render(null, div);\n- }).toThrowError(\n- 'ReactDOM.render(): Invalid component element.'\n- );\n+ expect(div.innerHTML).toBe('');\n+ } else {\n+ \/\/ Stack does not implement this.\n+ expect(function() {\n+ ReactDOM.render(null, div);\n+ }).toThrowError(\n+ 'ReactDOM.render(): Invalid component element.'\n+ );\n+ }\n+ } finally {\n+ ReactFeatureFlags.disableNewFiberFeatures = true;\n }\n });\n \ndiff --git a\/src\/renderers\/shared\/shared\/__tests__\/ReactStatelessComponent-test.js b\/src\/renderers\/shared\/shared\/__tests__\/ReactStatelessComponent-test.js\nindex b31706c66b..d02ef0b28c 100644\n--- a\/src\/renderers\/shared\/shared\/__tests__\/ReactStatelessComponent-test.js\n+++ b\/src\/renderers\/shared\/shared\/__tests__\/ReactStatelessComponent-test.js\n@@ -152,13 +152,8 @@ describe('ReactStatelessComponent', () => {\n expect(function() {\n ReactTestUtils.renderIntoDocument(

<\/div>);\n }).toThrowError(\n- ReactDOMFeatureFlags.useFiber ?\n- \/\/ Fiber gives a more specific error message for undefined because it\n- \/\/ supports more return types.\n- 'NotAComponent(...): Nothing was returned from render' :\n- \/\/ Stack's message is generic.\n- 'NotAComponent(...): A valid React element (or null) must be returned. ' +\n- 'You may have returned undefined, an array or some other invalid object.'\n+ 'NotAComponent(...): A valid React element (or null) must be returned. ' +\n+ 'You may have returned undefined, an array or some other invalid object.'\n );\n });\n \ndiff --git a\/src\/renderers\/testing\/__tests__\/ReactTestRenderer-test.js b\/src\/renderers\/testing\/__tests__\/ReactTestRenderer-test.js\nindex 584453d086..681d48ac02 100644\n--- a\/src\/renderers\/testing\/__tests__\/ReactTestRenderer-test.js\n+++ b\/src\/renderers\/testing\/__tests__\/ReactTestRenderer-test.js\n@@ -14,8 +14,14 @@\n var React = require('React');\n var ReactTestRenderer = require('ReactTestRenderer');\n var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n+var ReactFeatureFlags;\n \n describe('ReactTestRenderer', () => {\n+ beforeEach(() => {\n+ ReactFeatureFlags = require('ReactFeatureFlags');\n+ ReactFeatureFlags.disableNewFiberFeatures = false;\n+ });\n+\n function normalizeCodeLocInfo(str) {\n return str && str.replace(\/\\(at .+?:\\d+\\)\/g, '(at **)');\n }\n","commit":{"authorName":"Andrew Clark","authorEmail":"acdlite@fb.com","revision":"c0e5df66ecc4f98140d1089bc1feb4a78f2a32f5","shortRevision":"c0e5df66ec","subject":"Make disableNewFiberFeatures = true the default when runnings tests","authoredAt":"2017-01-17T11:16:24-08:00"}}

dillon1000/react

Files changed