{"commit":{"subject":"Rewrite ReactInstanceHandles-test to be less brittle","authorName":"Ben Alpert","shortRevision":"fe9a76ef25","revision":"fe9a76ef25bd0cd274598572d5cb0a952edd00da","authorEmail":"balpert@fb.com","authoredAt":"2015-09-26T15:11:21-07:00"},"body":"","parents":["60491d89f88a04a6be29a52b652090ba276ba7a9"],"files":[{"status":"M","path":"src\/renderers\/shared\/reconciler\/__tests__\/ReactInstanceHandles-test.js"}],"patch":"diff --git a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactInstanceHandles-test.js b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactInstanceHandles-test.js\nindex f5dbc051ff..7cb1ba9d95 100644\n--- a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactInstanceHandles-test.js\n+++ b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactInstanceHandles-test.js\n@@ -76,72 +76,84 @@ describe('ReactInstanceHandles', function() {\n \n describe('findComponentRoot', function() {\n it('should find the correct node with prefix sibling IDs', function() {\n- var parentNode = document.createElement('div');\n- var childNodeA = document.createElement('div');\n- var childNodeB = document.createElement('div');\n- parentNode.appendChild(childNodeA);\n- parentNode.appendChild(childNodeB);\n-\n- ReactMount.setID(parentNode, '.0');\n- ReactMount.setID(childNodeA, '.0.0');\n- ReactMount.setID(childNodeB, '.0.0:1');\n+ var parentNode = ReactTestUtils.renderIntoDocument(\n+

\n+

\n+ {[

]}\n+ <\/div>\n+ );\n+ var childNodeB = parentNode.childNodes[1];\n \n expect(\n- ReactMount.findComponentRoot(\n- parentNode,\n- ReactMount.getID(childNodeB)\n+ ReactMount.getNode(\n+ getNodeID(childNodeB)\n )\n ).toBe(childNodeB);\n });\n \n it('should work around unidentified nodes', function() {\n- var parentNode = document.createElement('div');\n- var childNodeA = document.createElement('div');\n- var childNodeB = document.createElement('div');\n- parentNode.appendChild(childNodeA);\n- parentNode.appendChild(childNodeB);\n+ var parentNode = ReactTestUtils.renderIntoDocument(\n+

\n+ {[

]}\n+ <\/div>\n+ );\n+ var childNodeB = parentNode.childNodes[0];\n \n- ReactMount.setID(parentNode, '.0');\n \/\/ No ID on `childNodeA`.\n- ReactMount.setID(childNodeB, '.0.0:1');\n+ var childNodeA = document.createElement('div');\n+ parentNode.insertBefore(childNodeA, childNodeB);\n \n expect(\n- ReactMount.findComponentRoot(\n- parentNode,\n- ReactMount.getID(childNodeB)\n+ ReactMount.getNode(\n+ getNodeID(childNodeB)\n )\n ).toBe(childNodeB);\n });\n \n it('should throw if a rendered element cannot be found', function() {\n- var parentNode = document.createElement('table');\n- var childNodeA = document.createElement('tbody');\n- var childNodeB = document.createElement('tr');\n- parentNode.appendChild(childNodeA);\n- childNodeA.appendChild(childNodeB);\n-\n- ReactMount.setID(parentNode, '.0');\n- \/\/ No ID on `childNodeA`, it was \"rendered by the browser\".\n- ReactMount.setID(childNodeB, '.0.1:0');\n+ spyOn(console, 'error');\n+ var parentNode = ReactTestUtils.renderIntoDocument(\n+ \n+ \n+ <\/table>\n+ );\n+ var childNodeA = parentNode.childNodes[0];\n+ var childNodeB;\n+ if (childNodeA.tagName === 'TR') {\n+ childNodeB = childNodeA;\n+ \/\/ No ID on `childNodeA`, it was \"rendered by the browser\".\n+ childNodeA = document.createElement('tbody');\n+ childNodeA.appendChild(childNodeB);\n+ parentNode.appendChild(childNodeA);\n+ } else {\n+ childNodeB = childNodeA.childNodes[0];\n+ }\n+ expect(childNodeA.tagName).toBe('TBODY');\n \n- expect(ReactMount.findComponentRoot(\n- parentNode,\n- ReactMount.getID(childNodeB)\n- )).toBe(childNodeB);\n+ expect(\n+ ReactMount.getNode(\n+ getNodeID(childNodeB)\n+ )\n+ ).toBe(childNodeB);\n \n+ var junkID = getNodeID(childNodeB) + ':junk';\n expect(function() {\n- ReactMount.findComponentRoot(\n- parentNode,\n- ReactMount.getID(childNodeB) + ':junk'\n+ ReactMount.getNode(\n+ junkID\n );\n }).toThrow(\n- 'Invariant Violation: findComponentRoot(..., .0.1:0:junk): ' +\n+ 'Invariant Violation: findComponentRoot(..., ' + junkID + '): ' +\n 'Unable to find element. This probably means the DOM was ' +\n 'unexpectedly mutated (e.g., by the browser), usually due to ' +\n 'forgetting a when using tables, nesting tags ' +\n 'like ,

, or , or using non-SVG elements in an

'\n );\n });\n });\n"}

dillon1000/react

Files changed