From 9449f8bf391512e258c822e80752f2b6c8db26a0 Mon Sep 17 00:00:00 2001
From: Nicolas Gallagher <necolas@fb.com>
Date: Mon, 12 Aug 2019 13:51:00 -0700
Subject: [PATCH] [react-events] Fix keyboard responder test (#16368)

---
 .../dom/__tests__/Keyboard-test.internal.js   | 58 ++++++-------------
 1 file changed, 18 insertions(+), 40 deletions(-)

diff --git a/packages/react-events/src/dom/__tests__/Keyboard-test.internal.js b/packages/react-events/src/dom/__tests__/Keyboard-test.internal.js
index 3cb373927b60..f3a655f79039 100644
--- a/packages/react-events/src/dom/__tests__/Keyboard-test.internal.js
+++ b/packages/react-events/src/dom/__tests__/Keyboard-test.internal.js
@@ -14,29 +14,22 @@ let ReactFeatureFlags;
 let ReactDOM;
 let useKeyboardResponder;
 
-const createEvent = (type, data) => {
-  const event = document.createEvent('CustomEvent');
-  event.initCustomEvent(type, true, true);
-  if (data != null) {
-    Object.entries(data).forEach(([key, value]) => {
-      event[key] = value;
-    });
-  }
-  return event;
-};
+import {keydown, keyup} from '../test-utils';
+
+function initializeModules(hasPointerEvents) {
+  jest.resetModules();
+  ReactFeatureFlags = require('shared/ReactFeatureFlags');
+  ReactFeatureFlags.enableFlareAPI = true;
+  React = require('react');
+  ReactDOM = require('react-dom');
+  useKeyboardResponder = require('react-events/keyboard').useKeyboardResponder;
+}
 
 describe('Keyboard event responder', () => {
   let container;
 
   beforeEach(() => {
-    jest.resetModules();
-    ReactFeatureFlags = require('shared/ReactFeatureFlags');
-    ReactFeatureFlags.enableFlareAPI = true;
-    React = require('react');
-    ReactDOM = require('react-dom');
-    useKeyboardResponder = require('react-events/keyboard')
-      .useKeyboardResponder;
-
+    initializeModules();
     container = document.createElement('div');
     document.body.appendChild(container);
   });
@@ -66,7 +59,9 @@ describe('Keyboard event responder', () => {
     });
 
     it('prevents custom events being dispatched', () => {
-      ref.current.dispatchEvent(createEvent('scroll'));
+      const target = ref.current;
+      target.dispatchEvent(keydown());
+      target.dispatchEvent(keyup());
       expect(onKeyDown).not.toBeCalled();
       expect(onKeyUp).not.toBeCalled();
     });
@@ -88,13 +83,7 @@ describe('Keyboard event responder', () => {
     });
 
     it('is called after "keydown" event', () => {
-      ref.current.dispatchEvent(
-        new KeyboardEvent('keydown', {
-          bubbles: true,
-          cancelable: true,
-          key: 'Q',
-        }),
-      );
+      ref.current.dispatchEvent(keydown({key: 'Q'}));
       expect(onKeyDown).toHaveBeenCalledTimes(1);
       expect(onKeyDown).toHaveBeenCalledWith(
         expect.objectContaining({key: 'Q', type: 'keydown'}),
@@ -120,20 +109,9 @@ describe('Keyboard event responder', () => {
     });
 
     it('is called after "keydown" event', () => {
-      ref.current.dispatchEvent(
-        new KeyboardEvent('keydown', {
-          bubbles: true,
-          cancelable: true,
-          key: 'Q',
-        }),
-      );
-      ref.current.dispatchEvent(
-        new KeyboardEvent('keyup', {
-          bubbles: true,
-          cancelable: true,
-          key: 'Q',
-        }),
-      );
+      const target = ref.current;
+      target.dispatchEvent(keydown({key: 'Q'}));
+      target.dispatchEvent(keyup({key: 'Q'}));
       expect(onKeyDown).toHaveBeenCalledTimes(1);
       expect(onKeyDown).toHaveBeenCalledWith(
         expect.objectContaining({key: 'Q', type: 'keydown'}),