{"commit":{"shortRevision":"b24216a7b1","revision":"b24216a7b1d27402a7f9937dc9eefe18f5372005","authorName":"Brian Vaughn","authorEmail":"bvaughn@fb.com","authoredAt":"2019-04-30T08:51:58-07:00","subject":"Merge pull request #234 from gaearon\/nested-suspense-test"},"body":"Add test coverage for nested Suspense","parents":["9e1b1e8c91bd7e7bab4760afffa695d139f3bc07","d81d74b2361248471ccca6f08595000a83a8a622"],"patch":"diff --git a\/src\/__tests__\/__snapshots__\/store-test.js.snap b\/src\/__tests__\/__snapshots__\/store-test.js.snap\nindex 1a620db0c4..39bddd9b58 100644\n--- a\/src\/__tests__\/__snapshots__\/store-test.js.snap\n+++ b\/src\/__tests__\/__snapshots__\/store-test.js.snap\n@@ -138,6 +138,180 @@ exports[`Store collapseNodesByDefault:false should support mount and update oper\n \n exports[`Store collapseNodesByDefault:false should support mount and update operations: 3: unmount 1`] = ``;\n \n+exports[`Store collapseNodesByDefault:false should support nested Suspense nodes: 1: third child is suspended 1`] = `\n+[root]\n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ \n+`;\n+\n+exports[`Store collapseNodesByDefault:false should support nested Suspense nodes: 2: first and third child are suspended 1`] = `\n+[root]\n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ \n+`;\n+\n+exports[`Store collapseNodesByDefault:false should support nested Suspense nodes: 3: second and third child are suspended 1`] = `\n+[root]\n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ \n+`;\n+\n+exports[`Store collapseNodesByDefault:false should support nested Suspense nodes: 4: first and third child are suspended 1`] = `\n+[root]\n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ \n+`;\n+\n+exports[`Store collapseNodesByDefault:false should support nested Suspense nodes: 5: parent is suspended 1`] = `\n+[root]\n+ ▾ \n+ \n+ ▾ \n+ \n+`;\n+\n+exports[`Store collapseNodesByDefault:false should support nested Suspense nodes: 6: all children are suspended 1`] = `\n+[root]\n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ \n+`;\n+\n+exports[`Store collapseNodesByDefault:false should support nested Suspense nodes: 7: only third child is suspended 1`] = `\n+[root]\n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ \n+`;\n+\n+exports[`Store collapseNodesByDefault:false should support nested Suspense nodes: 8: first and third child are suspended 1`] = `\n+[root]\n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ \n+`;\n+\n+exports[`Store collapseNodesByDefault:false should support nested Suspense nodes: 9: parent is suspended 1`] = `\n+[root]\n+ ▾ \n+ \n+ ▾ \n+ \n+`;\n+\n+exports[`Store collapseNodesByDefault:false should support nested Suspense nodes: 10: parent is suspended 1`] = `\n+[root]\n+ ▾ \n+ \n+ ▾ \n+ \n+`;\n+\n+exports[`Store collapseNodesByDefault:false should support nested Suspense nodes: 11: all children are suspended 1`] = `\n+[root]\n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ \n+`;\n+\n+exports[`Store collapseNodesByDefault:false should support nested Suspense nodes: 12: all children are suspended 1`] = `\n+[root]\n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ \n+`;\n+\n+exports[`Store collapseNodesByDefault:false should support nested Suspense nodes: 13: third child is suspended 1`] = `\n+[root]\n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ ▾ \n+ \n+ \n+`;\n+\n exports[`Store collapseNodesByDefault:false should support reordering of children: 1: mount 1`] = `\n [root]\n ▾ \ndiff --git a\/src\/__tests__\/store-test.js b\/src\/__tests__\/store-test.js\nindex 55b20b4cdc..067448426c 100644\n--- a\/src\/__tests__\/store-test.js\n+++ b\/src\/__tests__\/store-test.js\n@@ -163,6 +163,182 @@ describe('Store', () => {\n expect(store).toMatchSnapshot('2: resolved');\n });\n \n+ it('should support nested Suspense nodes', () => {\n+ const Component = () => null;\n+ const Loading = () =>

Loading...<\/div>;\n+ const Never = () => {\n+ throw new Promise(() => {});\n+ };\n+\n+ const Wrapper = ({\n+ suspendFirst = false,\n+ suspendSecond = false,\n+ suspendParent = false,\n+ }) => (\n+ \n+ \n+ }>\n+ \n+ }>\n+ {suspendFirst ? (\n+ \n+ ) : (\n+ \n+ )}\n+ <\/React.Suspense>\n+ }>\n+ {suspendSecond ? (\n+ \n+ ) : (\n+ \n+ )}\n+ <\/React.Suspense>\n+ }>\n+ \n+ <\/React.Suspense>\n+ {suspendParent && }\n+ \n+ <\/React.Suspense>\n+ <\/React.Fragment>\n+ );\n+\n+ const container = document.createElement('div');\n+ act(() =>\n+ ReactDOM.render(\n+ ,\n+ container\n+ )\n+ );\n+ expect(store).toMatchSnapshot('1: third child is suspended');\n+ act(() =>\n+ ReactDOM.render(\n+ ,\n+ container\n+ )\n+ );\n+ expect(store).toMatchSnapshot('2: first and third child are suspended');\n+ act(() =>\n+ ReactDOM.render(\n+ ,\n+ container\n+ )\n+ );\n+ expect(store).toMatchSnapshot('3: second and third child are suspended');\n+ act(() =>\n+ ReactDOM.render(\n+ ,\n+ container\n+ )\n+ );\n+ expect(store).toMatchSnapshot('4: first and third child are suspended');\n+ act(() =>\n+ ReactDOM.render(\n+ ,\n+ container\n+ )\n+ );\n+ expect(store).toMatchSnapshot('5: parent is suspended');\n+ act(() =>\n+ ReactDOM.render(\n+ ,\n+ container\n+ )\n+ );\n+ expect(store).toMatchSnapshot('6: all children are suspended');\n+ act(() =>\n+ ReactDOM.render(\n+ ,\n+ container\n+ )\n+ );\n+ expect(store).toMatchSnapshot('7: only third child is suspended');\n+\n+ \/\/ HACK There's only one renderer for this test\n+ const rendererID = Object.keys(agent._rendererInterfaces)[0];\n+ act(() =>\n+ agent.overrideSuspense({\n+ id: store.getElementIDAtIndex(4),\n+ rendererID,\n+ forceFallback: true,\n+ })\n+ );\n+ expect(store).toMatchSnapshot('8: first and third child are suspended');\n+ act(() =>\n+ agent.overrideSuspense({\n+ id: store.getElementIDAtIndex(2),\n+ rendererID,\n+ forceFallback: true,\n+ })\n+ );\n+ expect(store).toMatchSnapshot('9: parent is suspended');\n+ act(() =>\n+ ReactDOM.render(\n+ ,\n+ container\n+ )\n+ );\n+ expect(store).toMatchSnapshot('10: parent is suspended');\n+ act(() =>\n+ agent.overrideSuspense({\n+ id: store.getElementIDAtIndex(2),\n+ rendererID,\n+ forceFallback: false,\n+ })\n+ );\n+ expect(store).toMatchSnapshot('11: all children are suspended');\n+ act(() =>\n+ agent.overrideSuspense({\n+ id: store.getElementIDAtIndex(4),\n+ rendererID,\n+ forceFallback: false,\n+ })\n+ );\n+ expect(store).toMatchSnapshot('12: all children are suspended');\n+ act(() =>\n+ ReactDOM.render(\n+ ,\n+ container\n+ )\n+ );\n+ expect(store).toMatchSnapshot('13: third child is suspended');\n+ });\n+\n it('should support collapsing parts of the tree', () => {\n const Grandparent = ({ count }) => (\n \n","files":[{"status":"M","path":"src\/__tests__\/__snapshots__\/store-test.js.snap"},{"status":"M","path":"src\/__tests__\/store-test.js"}]}

dillon1000/react

Files changed