{"parents":["e1b733fa8382f74dd790964993856ce5a85bf363"],"body":"","patch":"diff --git a\/src\/renderers\/shared\/fiber\/ReactFiberScheduler.js b\/src\/renderers\/shared\/fiber\/ReactFiberScheduler.js\nindex 21feb4bc2f..11078acf06 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberScheduler.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberScheduler.js\n@@ -390,7 +390,8 @@ module.exports = function(config : HostConfig {\n ReactNoop = require('ReactNoop');\n });\n \n- function div(...children) {\n- children = children.map(c => typeof c === 'string' ? { text: c } : c);\n- return { type: 'div', children, prop: undefined };\n- }\n-\n- function span(prop) {\n- return { type: 'span', children: [], prop };\n- }\n-\n it('applies updates in order of priority', () => {\n let state;\n class Foo extends React.Component {\n@@ -50,8 +41,10 @@ describe('ReactIncrementalUpdates', () => {\n }\n \n ReactNoop.render();\n+ ReactNoop.flushDeferredPri(25);\n+ expect(state).toEqual({ a: 'a' });\n ReactNoop.flush();\n- expect(Object.keys(state)).toEqual(['a', 'b', 'c']);\n+ expect(state).toEqual({ a: 'a', b: 'b', c: 'c' });\n });\n \n it('applies updates with equal priority in insertion order', () => {\n@@ -72,20 +65,26 @@ describe('ReactIncrementalUpdates', () => {\n \n ReactNoop.render();\n ReactNoop.flush();\n- expect(Object.keys(state)).toEqual(['a', 'b', 'c']);\n+ expect(state).toEqual({ a: 'a', b: 'b', c: 'c' });\n });\n \n it('only drops updates with equal or lesser priority when replaceState is called', () => {\n let instance;\n+ let ops = [];\n const Foo = React.createClass({\n getInitialState() {\n return {};\n },\n+ componentDidMount() {\n+ ops.push('componentDidMount');\n+ },\n+ componentDidUpdate() {\n+ ops.push('componentDidUpdate');\n+ },\n render() {\n+ ops.push('render');\n instance = this;\n- return (\n- \n- );\n+ return

;\n },\n });\n \n@@ -104,28 +103,45 @@ describe('ReactIncrementalUpdates', () => {\n ReactNoop.flushAnimationPri();\n \/\/ Even though a replaceState has been already scheduled, it hasn't been\n \/\/ flushed yet because it has low priority.\n- expect(ReactNoop.getChildren()).toEqual([span('ab')]);\n+ expect(instance.state).toEqual({ a: 'a', b: 'b' });\n+ expect(ops).toEqual([\n+ 'render',\n+ 'componentDidMount',\n+ 'render',\n+ 'componentDidUpdate',\n+ ]);\n+\n+ ops = [];\n \n ReactNoop.flush();\n \/\/ Now the rest of the updates are flushed.\n- expect(ReactNoop.getChildren()).toEqual([span('cd')]);\n+ expect(instance.state).toEqual({ c: 'c', d: 'd' });\n+ expect(ops).toEqual([\n+ 'render',\n+ 'componentDidUpdate',\n+ ]);\n });\n \n it('can abort an update, schedule additional updates, and resume', () => {\n let instance;\n+ let ops = [];\n class Foo extends React.Component {\n state = {};\n+ componentDidUpdate() {\n+ ops.push('componentDidUpdate');\n+ }\n render() {\n+ ops.push('render');\n instance = this;\n- return (\n- \n- );\n+ return

;\n }\n }\n \n ReactNoop.render();\n ReactNoop.flush();\n \n+ ops = [];\n+\n let progressedUpdates = [];\n function createUpdate(letter) {\n return () => {\n@@ -141,9 +157,14 @@ describe('ReactIncrementalUpdates', () => {\n instance.setState(createUpdate('c'));\n \n \/\/ Do just enough work to begin the update but not enough to flush it\n- ReactNoop.flushDeferredPri(20);\n- expect(ReactNoop.getChildren()).toEqual([span('')]);\n+ ReactNoop.flushDeferredPri(15);\n+ \/\/ expect(ReactNoop.getChildren()).toEqual([span('')]);\n+ expect(ops).toEqual(['render']);\n expect(progressedUpdates).toEqual(['a', 'b', 'c']);\n+ expect(instance.state).toEqual({ a: 'a', b: 'b', c: 'c' });\n+\n+ ops = [];\n+ progressedUpdates = [];\n \n instance.setState(createUpdate('f'));\n ReactNoop.performAnimationWork(() => {\n@@ -152,21 +173,35 @@ describe('ReactIncrementalUpdates', () => {\n });\n instance.setState(createUpdate('g'));\n \n- \/\/ Updates a, b, and c were aborted, so they should be applied first even\n- \/\/ though they have low priority. Update f was scheduled after the render\n- \/\/ was aborted, so it should come after d and e, which have higher priority.\n+ ReactNoop.flushAnimationPri();\n+ expect(ops).toEqual([\n+ \/\/ Flushes animation work (d and e)\n+ 'render',\n+ 'componentDidUpdate',\n+ ]);\n+ ops = [];\n ReactNoop.flush();\n- expect(ReactNoop.getChildren()).toEqual([span('abcdefg')]);\n- expect(progressedUpdates).toEqual(['a', 'b', 'c', 'd', 'e', 'f', 'g']);\n+ expect(ops).toEqual([\n+ \/\/ Flushes deferred work (f and g)\n+ 'render',\n+ 'componentDidUpdate',\n+ ]);\n+ expect(progressedUpdates).toEqual(['d', 'e', 'a', 'b', 'c', 'f', 'g']);\n+ expect(instance.state).toEqual({ a: 'a', b: 'b', c: 'c', d: 'd', e: 'e', f: 'f', g: 'g' });\n });\n \n it('can abort an update, schedule a replaceState, and resume', () => {\n let instance;\n+ let ops = [];\n const Foo = React.createClass({\n getInitialState() {\n return {};\n },\n+ componentDidUpdate() {\n+ ops.push('componentDidUpdate');\n+ },\n render() {\n+ ops.push('render');\n instance = this;\n return (\n \n@@ -176,6 +211,7 @@ describe('ReactIncrementalUpdates', () => {\n \n ReactNoop.render();\n ReactNoop.flush();\n+ ops = [];\n \n let progressedUpdates = [];\n function createUpdate(letter) {\n@@ -193,9 +229,11 @@ describe('ReactIncrementalUpdates', () => {\n \n \/\/ Do just enough work to begin the update but not enough to flush it\n ReactNoop.flushDeferredPri(20);\n- expect(ReactNoop.getChildren()).toEqual([span('')]);\n+ expect(ops).toEqual(['render']);\n expect(progressedUpdates).toEqual(['a', 'b', 'c']);\n+ expect(instance.state).toEqual({ a: 'a', b: 'b', c: 'c' });\n \n+ ops = [];\n progressedUpdates = [];\n \n instance.setState(createUpdate('f'));\n@@ -205,14 +243,10 @@ describe('ReactIncrementalUpdates', () => {\n });\n instance.setState(createUpdate('g'));\n \n- \/\/ Updates a, b, and c were aborted, so they should be applied first even\n- \/\/ though they have low priority. Update f was scheduled after the render\n- \/\/ was aborted, so it should come after d and e, which have higher priority.\n- \/\/ Because e is a replaceState, d gets dropped.\n ReactNoop.flush();\n- expect(ReactNoop.getChildren()).toEqual([span('efg')]);\n \/\/ Ensure that updater function d is never called.\n expect(progressedUpdates).toEqual(['e', 'f', 'g']);\n+ expect(instance.state).toEqual({ e: 'e', f: 'f', g: 'g' });\n });\n \n it('does not call callbacks that are scheduled by another callback until a later commit', () => {\n@@ -259,7 +293,7 @@ describe('ReactIncrementalUpdates', () => {\n render() {\n ops.push('render');\n instance = this;\n- return ;\n+ return

;\n }\n }\n ReactNoop.render();\n@@ -273,7 +307,7 @@ describe('ReactIncrementalUpdates', () => {\n });\n ReactNoop.flush();\n \n- expect(ReactNoop.getChildren()).toEqual([span('ab')]);\n+ expect(instance.state).toEqual({ a: 'a', b: 'b' });\n expect(ops).toEqual([\n 'componentWillReceiveProps',\n 'render',\n@@ -290,7 +324,7 @@ describe('ReactIncrementalUpdates', () => {\n render() {\n ops.push('render');\n instance = this;\n- return ;\n+ return

;\n }\n }\n \n@@ -304,7 +338,6 @@ describe('ReactIncrementalUpdates', () => {\n });\n \n ReactNoop.flush();\n- expect(ReactNoop.getChildren()).toEqual([span('ab')]);\n expect(ops).toEqual([\n \/\/ Initial render\n 'render',\n@@ -313,6 +346,7 @@ describe('ReactIncrementalUpdates', () => {\n \/\/ be flushed in the same commit.\n 'render',\n ]);\n+ expect(instance.state).toEqual({ a: 'a', b: 'b' });\n \n expectDev(console.error.calls.count()).toBe(1);\n console.error.calls.reset();\n","commit":{"authorName":"Andrew Clark","authorEmail":"acdlite@fb.com","revision":"496512f8b8cb81cbeae1a4ffc7a53f515b5b72d7","authoredAt":"2016-12-13T20:09:19-08:00","subject":"Update tests to not rely on key iteration order","shortRevision":"496512f8b8"},"files":[{"status":"M","path":"src\/renderers\/shared\/fiber\/ReactFiberScheduler.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalUpdates-test.js"}]}

dillon1000/react

Files changed