{"body":"Fix Test Failures","commit":{"authoredAt":"2013-07-28T07:02:17-07:00","subject":"Merge pull request #237 from yungsters\/master","authorEmail":"bn@cs.stanford.edu","revision":"c7d6a5ae4d707cb5c1922aa8bb2c07e0c842ed6e","authorName":"Ben Newman","shortRevision":"c7d6a5ae4d"},"patch":"diff --git a\/src\/core\/__tests__\/ReactMultiChild-test.js b\/src\/core\/__tests__\/ReactMultiChild-test.js\nindex 8451506237..2a6d25ef22 100644\n--- a\/src\/core\/__tests__\/ReactMultiChild-test.js\n+++ b\/src\/core\/__tests__\/ReactMultiChild-test.js\n@@ -21,14 +21,19 @@ describe('ReactMultiChild', function() {\n var React;\n var setInnerHTML;\n \n+ \/\/ Only run this test suite if `Element.prototype.innerHTML` can be spied on.\n+ var innerHTMLDescriptor = Object.getOwnPropertyDescriptor(\n+ Element.prototype,\n+ 'innerHTML'\n+ );\n+ if (!innerHTMLDescriptor) {\n+ return;\n+ }\n+\n beforeEach(function() {\n require('mock-modules').dumpCache();\n React = require('React');\n \n- var innerHTMLDescriptor = Object.getOwnPropertyDescriptor(\n- Element.prototype,\n- 'innerHTML'\n- );\n Object.defineProperty(Element.prototype, 'innerHTML', {\n set: setInnerHTML = jasmine.createSpy().andCallFake(\n innerHTMLDescriptor.set\ndiff --git a\/src\/dom\/__tests__\/Danger-test.js b\/src\/dom\/__tests__\/Danger-test.js\nindex 62bccb41d1..de1ca88b44 100644\n--- a\/src\/dom\/__tests__\/Danger-test.js\n+++ b\/src\/dom\/__tests__\/Danger-test.js\n@@ -59,7 +59,7 @@ describe('Danger', function() {\n \n it('should render lists of markup with similar `nodeName`', function() {\n var renderedMarkup = Danger.dangerouslyRenderMarkup(\n- ['

1<\/p>', '

2<\/p>', '

3<\/p>']\n+ ['

1<\/p>', '

2<\/p>', '

3<\/p>']\n );\n \n expect(renderedMarkup.length).toBe(3);\n@@ -75,13 +75,13 @@ describe('Danger', function() {\n \n it('should render lists of markup with different `nodeName`', function() {\n var renderedMarkup = Danger.dangerouslyRenderMarkup(\n- ['

1<\/p>', '2<\/tr>', '

3<\/p>']\n+ ['

1<\/p>', '2<\/td>', '

3<\/p>']\n );\n \n expect(renderedMarkup.length).toBe(3);\n \n expect(renderedMarkup[0].nodeName).toBe('P');\n- expect(renderedMarkup[1].nodeName).toBe('TR');\n+ expect(renderedMarkup[1].nodeName).toBe('TD');\n expect(renderedMarkup[2].nodeName).toBe('P');\n \n expect(renderedMarkup[0].innerHTML).toBe('1');\n","parents":["c347b720a9ee6009103174cf0ededca6aab070d9","d5e970b93fc0e5ab9d284c265b170eecee2ad0ad"],"files":[{"status":"M","path":"src\/core\/__tests__\/ReactMultiChild-test.js"},{"status":"M","path":"src\/dom\/__tests__\/Danger-test.js"}]}

dillon1000/react

Files changed