From 30faaf142d403442fb85a108665af50300da503a Mon Sep 17 00:00:00 2001
From: Nathan Hunzaker <nate.hunzaker@gmail.com>
Date: Wed, 15 Nov 2017 07:11:03 -0500
Subject: [PATCH] Set correct event type on fake TestUtils events

This commit fixes an issue where events generated by the test utils
had no type. These events are not real DOM Event objects, and their
constructor never assigned the provided event type property.

Additionally, it looks like the Event object was being constructed
with the top level type (`topClick` vs `click`). This commit ensures
that ReactTestUtils.Simulate and ReactTestUtils.SimulateNative
correctly assign the event type.
---
 .../src/__tests__/ReactTestUtils-test.js      | 28 +++++++++++++++++++
 .../src/test-utils/ReactTestUtils.js          | 16 ++++++-----
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactTestUtils-test.js b/packages/react-dom/src/__tests__/ReactTestUtils-test.js
index a8f1b69f58a12..ff5043020cd08 100644
--- a/packages/react-dom/src/__tests__/ReactTestUtils-test.js
+++ b/packages/react-dom/src/__tests__/ReactTestUtils-test.js
@@ -429,6 +429,34 @@ describe('ReactTestUtils', () => {
         jasmine.objectContaining({target: input}),
       );
     });
+
+    it('should set the correct event type when simulating synthetic events', () => {
+      expect.assertions(1);
+
+      let handler = function(event) {
+        expect(event.nativeEvent.type).toEqual('click');
+      };
+
+      let button = ReactTestUtils.renderIntoDocument(
+        <button onClick={handler} />,
+      );
+
+      ReactTestUtils.Simulate.click(button);
+    });
+
+    it('should set the correct event type when simulating native events', () => {
+      expect.assertions(1);
+
+      let handler = function(event) {
+        expect(event.nativeEvent.type).toEqual('click');
+      };
+
+      let button = ReactTestUtils.renderIntoDocument(
+        <button onClick={handler} />,
+      );
+
+      ReactTestUtils.SimulateNative.click(button);
+    });
   });
 
   it('should call setState callback with no arguments', () => {
diff --git a/packages/react-dom/src/test-utils/ReactTestUtils.js b/packages/react-dom/src/test-utils/ReactTestUtils.js
index 355daad055365..166ae362c845a 100644
--- a/packages/react-dom/src/test-utils/ReactTestUtils.js
+++ b/packages/react-dom/src/test-utils/ReactTestUtils.js
@@ -32,7 +32,9 @@ var {
 
 var topLevelTypes = BrowserEventConstants.topLevelTypes;
 
-function Event(suffix) {}
+function FakeNativeEvent(type) {
+  this.type = type;
+}
 
 /**
  * @class ReactTestUtils
@@ -359,9 +361,8 @@ function makeSimulator(eventType) {
     var dispatchConfig =
       EventPluginRegistry.eventNameDispatchConfigs[eventType];
 
-    var fakeNativeEvent = new Event();
+    var fakeNativeEvent = new FakeNativeEvent(eventType.toLowerCase());
     fakeNativeEvent.target = domNode;
-    fakeNativeEvent.type = eventType.toLowerCase();
 
     // We don't use SyntheticEvent.getPooled in order to not have to worry about
     // properly destroying any properties assigned from `eventData` upon release
@@ -438,20 +439,21 @@ buildSimulators();
  * to dispatch synthetic events.
  */
 
-function makeNativeSimulator(eventType) {
+function makeNativeSimulator(topLevelType) {
   return function(domComponentOrNode, nativeEventData) {
-    var fakeNativeEvent = new Event(eventType);
+    var eventType = topLevelTypes[topLevelType];
+    var fakeNativeEvent = new FakeNativeEvent(eventType);
     Object.assign(fakeNativeEvent, nativeEventData);
     if (ReactTestUtils.isDOMComponent(domComponentOrNode)) {
       ReactTestUtils.simulateNativeEventOnDOMComponent(
-        eventType,
+        topLevelType,
         domComponentOrNode,
         fakeNativeEvent,
       );
     } else if (domComponentOrNode.tagName) {
       // Will allow on actual dom nodes.
       ReactTestUtils.simulateNativeEventOnNode(
-        eventType,
+        topLevelType,
         domComponentOrNode,
         fakeNativeEvent,
       );