diff --git a/packages/react-dom/src/events/__tests__/EnterLeaveEventPlugin-test.js b/packages/react-dom/src/events/__tests__/EnterLeaveEventPlugin-test.js index 6a0a8af98c..a967c6c950 100644 --- a/packages/react-dom/src/events/__tests__/EnterLeaveEventPlugin-test.js +++ b/packages/react-dom/src/events/__tests__/EnterLeaveEventPlugin-test.js @@ -12,27 +12,28 @@ var React; var ReactDOM; -const simulateMouseEvent = (node, type, relatedTarget) => { - node.dispatchEvent( - new MouseEvent(type, { - bubbles: true, - cancelable: true, - relatedTarget, - }), - ); -}; - describe('EnterLeaveEventPlugin', () => { + var container; + beforeEach(() => { jest.resetModules(); React = require('react'); ReactDOM = require('react-dom'); + + // The container has to be attached for events to fire. + container = document.createElement('div'); + document.body.appendChild(container); + }); + + afterEach(() => { + document.body.removeChild(container); + container = null; }); it('should set onMouseLeave relatedTarget properly in iframe', () => { const iframe = document.createElement('iframe'); - document.body.appendChild(iframe); + container.appendChild(iframe); const iframeDocument = iframe.contentDocument; iframeDocument.write( '
', @@ -50,7 +51,14 @@ describe('EnterLeaveEventPlugin', () => { iframeDocument.body.getElementsByTagName('div')[0], ); - simulateMouseEvent(node, 'mouseout', iframe.contentWindow); + node.dispatchEvent( + new MouseEvent('mouseout', { + bubbles: true, + cancelable: true, + relatedTarget: iframe.contentWindow, + }), + ); + expect(leaveEvents.length).toBe(1); expect(leaveEvents[0].target).toBe(node); expect(leaveEvents[0].relatedTarget).toBe(iframe.contentWindow); @@ -58,7 +66,7 @@ describe('EnterLeaveEventPlugin', () => { it('should set onMouseEnter relatedTarget properly in iframe', () => { const iframe = document.createElement('iframe'); - document.body.appendChild(iframe); + container.appendChild(iframe); const iframeDocument = iframe.contentDocument; iframeDocument.write( '
', @@ -76,7 +84,14 @@ describe('EnterLeaveEventPlugin', () => { iframeDocument.body.getElementsByTagName('div')[0], ); - simulateMouseEvent(node, 'mouseover', null); + node.dispatchEvent( + new MouseEvent('mouseover', { + bubbles: true, + cancelable: true, + relatedTarget: null, + }), + ); + expect(enterEvents.length).toBe(1); expect(enterEvents[0].target).toBe(node); expect(enterEvents[0].relatedTarget).toBe(iframe.contentWindow); @@ -87,6 +102,7 @@ describe('EnterLeaveEventPlugin', () => { let parentEnterCalls = 0; let childEnterCalls = 0; let parent = null; + class Parent extends React.Component { render() { return ( @@ -101,15 +117,18 @@ describe('EnterLeaveEventPlugin', () => { } } - const div = document.createElement('div'); - ReactDOM.render(, div); + ReactDOM.render(, container); // The issue only reproduced on insertion during the first update. - ReactDOM.render(, div); - - document.body.appendChild(div); + ReactDOM.render(, container); // Enter from parent into the child. - simulateMouseEvent(parent, 'mouseout', parent.firstChild); + parent.dispatchEvent( + new MouseEvent('mouseout', { + bubbles: true, + cancelable: true, + relatedTarget: parent.firstChild, + }), + ); // Entering a child should fire on the child, not on the parent. expect(childEnterCalls).toBe(1); diff --git a/packages/react-dom/src/events/__tests__/SyntheticClipboardEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticClipboardEvent-test.js index d1d87b1678..64e88c73c4 100644 --- a/packages/react-dom/src/events/__tests__/SyntheticClipboardEvent-test.js +++ b/packages/react-dom/src/events/__tests__/SyntheticClipboardEvent-test.js @@ -19,6 +19,7 @@ describe('SyntheticClipboardEvent', () => { React = require('react'); ReactDOM = require('react-dom'); + // The container has to be attached for events to fire. container = document.createElement('div'); document.body.appendChild(container); }); diff --git a/packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js index 6494d24d47..d20108bee8 100644 --- a/packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js +++ b/packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js @@ -19,6 +19,7 @@ describe('SyntheticWheelEvent', () => { React = require('react'); ReactDOM = require('react-dom'); + // The container has to be attached for events to fire. container = document.createElement('div'); document.body.appendChild(container); }); diff --git a/packages/react-dom/src/events/__tests__/getEventKey-test.js b/packages/react-dom/src/events/__tests__/getEventKey-test.js index a49866d6ab..7ec82a3dae 100644 --- a/packages/react-dom/src/events/__tests__/getEventKey-test.js +++ b/packages/react-dom/src/events/__tests__/getEventKey-test.js @@ -9,13 +9,24 @@ 'use strict'; +var React; +var ReactDOM; + describe('getEventKey', () => { - var React; - var ReactDOM; + var container; beforeEach(() => { React = require('react'); ReactDOM = require('react-dom'); + + // The container has to be attached for events to fire. + container = document.createElement('div'); + document.body.appendChild(container); + }); + + afterEach(() => { + document.body.removeChild(container); + container = null; }); describe('when key is implemented in a browser', () => { @@ -28,9 +39,7 @@ describe('getEventKey', () => { } } - var container = document.createElement('div'); ReactDOM.render(, container); - document.body.appendChild(container); var nativeEvent = new KeyboardEvent('keydown', { key: 'Del', @@ -39,7 +48,6 @@ describe('getEventKey', () => { }); container.firstChild.dispatchEvent(nativeEvent); expect(key).toBe('Delete'); - document.body.removeChild(container); }); }); @@ -52,9 +60,7 @@ describe('getEventKey', () => { } } - var container = document.createElement('div'); ReactDOM.render(, container); - document.body.appendChild(container); var nativeEvent = new KeyboardEvent('keydown', { key: 'f', @@ -63,7 +69,6 @@ describe('getEventKey', () => { }); container.firstChild.dispatchEvent(nativeEvent); expect(key).toBe('f'); - document.body.removeChild(container); }); }); }); @@ -79,9 +84,7 @@ describe('getEventKey', () => { } } - var container = document.createElement('div'); ReactDOM.render(, container); - document.body.appendChild(container); var nativeEvent = new KeyboardEvent('keypress', { charCode: 13, @@ -90,7 +93,6 @@ describe('getEventKey', () => { }); container.firstChild.dispatchEvent(nativeEvent); expect(key).toBe('Enter'); - document.body.removeChild(container); }); }); @@ -103,9 +105,7 @@ describe('getEventKey', () => { } } - var container = document.createElement('div'); ReactDOM.render(, container); - document.body.appendChild(container); var nativeEvent = new KeyboardEvent('keypress', { charCode: 65, @@ -114,7 +114,6 @@ describe('getEventKey', () => { }); container.firstChild.dispatchEvent(nativeEvent); expect(key).toBe('A'); - document.body.removeChild(container); }); }); }); @@ -129,9 +128,7 @@ describe('getEventKey', () => { } } - var container = document.createElement('div'); ReactDOM.render(, container); - document.body.appendChild(container); var nativeEvent = new KeyboardEvent('keydown', { keyCode: 45, @@ -140,7 +137,6 @@ describe('getEventKey', () => { }); container.firstChild.dispatchEvent(nativeEvent); expect(key).toBe('Insert'); - document.body.removeChild(container); }); }); @@ -153,9 +149,7 @@ describe('getEventKey', () => { } } - var container = document.createElement('div'); ReactDOM.render(, container); - document.body.appendChild(container); var nativeEvent = new KeyboardEvent('keydown', { keyCode: 1337, @@ -164,7 +158,6 @@ describe('getEventKey', () => { }); container.firstChild.dispatchEvent(nativeEvent); expect(key).toBe('Unidentified'); - document.body.removeChild(container); }); }); });