-
Notifications
You must be signed in to change notification settings - Fork 49.8k
Rewrite setInnerHTML tests to use Public API. #11385
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
29821ba
Rewrite setInnerHTML tests to use Public API.
69e7c54
Rename variables and drop unnecessary variable assignments.
53b7b4a
Merge branch 'master' into master
3d73094
Rename testfile to dangerouslySetInnerHTML-test.js
ef5a516
Merge pull request #1 from facebook/master
ad14f12
Properly prettify test file.
1d9641c
Merge branch 'master' of https://github.com/facebook/react
12165eb
Rewrite SVG tests to verify we recover from missing innerHTML
gaearon File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,60 +9,61 @@ | |
|
|
||
| 'use strict'; | ||
|
|
||
| // TODO: can we express this test with only public API? | ||
| var setInnerHTML = require('../setInnerHTML'); | ||
| var Namespaces = require('../../shared/DOMNamespaces').Namespaces; | ||
| const React = require('react'); | ||
| const ReactDOM = require('react-dom'); | ||
|
|
||
| describe('setInnerHTML', () => { | ||
| describe('dangerouslySetInnerHTML', () => { | ||
| describe('when the node has innerHTML property', () => { | ||
| it('sets innerHTML on it', () => { | ||
| var node = document.createElement('div'); | ||
| var html = '<h1>hello</h1>'; | ||
| setInnerHTML(node, html); | ||
| expect(node.innerHTML).toBe(html); | ||
| const container = document.createElement('div'); | ||
| const node = ReactDOM.render( | ||
| <div dangerouslySetInnerHTML={{__html: '<h1>Hello</h1>'}} />, | ||
| container, | ||
| ); | ||
| expect(node.innerHTML).toBe('<h1>Hello</h1>'); | ||
| }); | ||
| }); | ||
|
|
||
| describe('when the node does not have an innerHTML property', () => { | ||
| var node; | ||
| var nodeProxy; | ||
| let container; | ||
| beforeEach(() => { | ||
| // Create a mock node that looks like an SVG in IE (without innerHTML) | ||
| node = document.createElementNS(Namespaces.svg, 'svg'); | ||
|
|
||
| nodeProxy = new Proxy(node, { | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Removing this causes the test to no longer verify the SVG IE code path. You can test it yourself by commenting out the related parts in |
||
| has: (target, prop) => { | ||
| return prop === 'innerHTML' ? false : prop in target; | ||
| }, | ||
| }); | ||
| // Create a mock container that looks like a svg in IE (without innerHTML) | ||
| container = document.createElementNS('http://www.w3.org/2000/svg', 'svg'); | ||
|
|
||
| spyOn(node, 'appendChild').and.callThrough(); | ||
| spyOn(node, 'removeChild').and.callThrough(); | ||
| spyOn(container, 'appendChild').and.callThrough(); | ||
| spyOn(container, 'removeChild').and.callThrough(); | ||
| }); | ||
|
|
||
| it('sets innerHTML on it', () => { | ||
| var html = '<circle></circle><rect></rect>'; | ||
| setInnerHTML(nodeProxy, html); | ||
| const html = '<circle></circle>'; | ||
|
|
||
| ReactDOM.render(<g dangerouslySetInnerHTML={{__html: html}} />, container); | ||
|
|
||
| expect(node.appendChild.calls.argsFor(0)[0].outerHTML).toBe( | ||
| expect(container.appendChild.calls.argsFor(0)[0].innerHTML).toBe( | ||
| '<circle></circle>', | ||
| ); | ||
| expect(node.appendChild.calls.argsFor(1)[0].outerHTML).toBe( | ||
| '<rect></rect>', | ||
| ); | ||
| }); | ||
|
|
||
| it('clears previous children', () => { | ||
| var firstHtml = '<rect></rect>'; | ||
| var secondHtml = '<circle></circle>'; | ||
| setInnerHTML(nodeProxy, firstHtml); | ||
| const firstHtml = '<rect></rect>'; | ||
| const secondHtml = '<circle></circle>'; | ||
|
|
||
| setInnerHTML(nodeProxy, secondHtml); | ||
| ReactDOM.render( | ||
| <g dangerouslySetInnerHTML={{__html: firstHtml}} />, | ||
| container, | ||
| ); | ||
| ReactDOM.unmountComponentAtNode(container); | ||
| ReactDOM.render( | ||
| <g dangerouslySetInnerHTML={{__html: secondHtml}} />, | ||
| container, | ||
| ); | ||
|
|
||
| expect(node.removeChild.calls.argsFor(0)[0].outerHTML).toBe( | ||
| expect(container.removeChild.calls.argsFor(0)[0].innerHTML).toBe( | ||
| '<rect></rect>', | ||
| ); | ||
| expect(node.innerHTML).toBe('<circle></circle>'); | ||
| expect(container.appendChild.calls.argsFor(1)[0].innerHTML).toBe( | ||
| '<circle></circle>', | ||
| ); | ||
| }); | ||
| }); | ||
| }); | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's also rename test file?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On it!