(fix) use custom keyCodes or codes when provided to trigger options

Author: Jess

Diff for: packages/test-utils/src/create-dom-event.js

@@ -1,4 +1,5 @@
 import eventTypes from 'dom-event-types'
+import { throwError } from 'shared/util'
 
 const defaultEventType = {
   eventInterface: 'Event',
@@ -24,6 +25,19 @@ const modifiers = {
   pagedown: 34
 }
 
+function getOptions(modifier, { bubbles, cancelable }, options) {
+  const keyCode = modifiers[modifier] || options.keyCode || options.code
+
+  const derivedOptions = { keyCode, code: keyCode }
+
+  return {
+    ...options, // What the user passed in as the second argument to #trigger
+    bubbles,
+    cancelable,
+    ...derivedOptions // Computed values, not necessarily the raw values that the user passed in
+  }
+}
+
 function createEvent(
   type,
   modifier,
@@ -35,14 +49,12 @@ function createEvent(
       ? window[eventInterface]
       : window.Event
 
-  const event = new SupportedEventInterface(type, {
+  const event = new SupportedEventInterface(
+    type,
     // event properties can only be added when the event is instantiated
     // custom properties must be added after the event has been instantiated
-    ...options,
-    bubbles,
-    cancelable,
-    keyCode: modifiers[modifier]
-  })
+    getOptions(modifier, { bubbles, cancelable }, options)
+  )
 
   return event
 }

Diff for: test/specs/wrapper/trigger.spec.js

@@ -37,6 +37,22 @@ describeWithShallowAndMount('trigger', mountingMethod => {
     expect(keydownHandler.calledOnce).to.equal(true)
   })
 
+  it('causes keydown handler to fire with the appropriate keyCode when wrapper.trigger("keydown", { keyCode: 65 }) is fired on a Component', () => {
+    const keydownHandler = sandbox.stub()
+    const wrapper = mountingMethod(ComponentWithEvents, {
+      propsData: { keydownHandler }
+    })
+    wrapper.find('.keydown').trigger('keydown', { keyCode: 65 })
+
+    const keyboardEvent = keydownHandler.getCall(0).args[0]
+
+    // Unfortunately, JSDom will give different types than PhantomJS for the keyCodes.
+    // parseInt to normalize. I can't find a matcher here https://www.chaijs.com/api/bdd/
+    // that relies on (`==`) instead of strict equals (`===`)
+    expect(parseInt(keyboardEvent.keyCode, 10)).to.equal(65)
+    expect(parseInt(keyboardEvent.code, 10)).to.equal(65)
+  })
+
   it('causes keydown handler to fire when wrapper.trigger("keydown.enter") is fired on a Component', () => {
     const keydownHandler = sandbox.stub()
     const wrapper = mountingMethod(ComponentWithEvents, {