Skip to content
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

[react-events] Fix keyboard responder test #16368

Merged
merged 1 commit into from
Aug 12, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 18 additions & 40 deletions packages/react-events/src/dom/__tests__/Keyboard-test.internal.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
Expand Down Expand Up @@ -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();
});
Expand All @@ -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'}),
Expand All @@ -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'}),
Expand Down