ExecutionContext: triggerEvent

san650 · Oct 29, 2019 · 2273504 · 2273504
1 parent d712387
commit 2273504
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 30 deletions.
diff --git a/addon-test-support/-private/execution_context/acceptance.js b/addon-test-support/-private/execution_context/acceptance.js
@@ -48,9 +48,9 @@ AcceptanceExecutionContext.prototype = {
     triggerEvent(element, 'change');
   },
 
-  triggerEvent(selector, container, options, eventName, eventOptions) {
+  triggerEvent(element, eventName, eventOptions) {
     /* global triggerEvent */
-    triggerEvent(selector, container, eventName, eventOptions);
+    triggerEvent(element, eventName, eventOptions);
   },
 
   focus(selector, options) {

diff --git a/addon-test-support/-private/execution_context/integration.js b/addon-test-support/-private/execution_context/integration.js
@@ -55,14 +55,10 @@ IntegrationExecutionContext.prototype = {
     }
   },
 
-  triggerEvent(selector, container, options, eventName, eventOptions) {
+  triggerEvent(element, eventName, eventOptions) {
     let event = $.Event(eventName, eventOptions);
 
-    if (container) {
-      $(selector, container).trigger(event);
-    } else {
-      this.testContext.$(selector).trigger(event);
-    }
+    $(element).trigger(event);
   },
 
   focus(selector, options) {

diff --git a/addon-test-support/-private/execution_context/native-events-context.js b/addon-test-support/-private/execution_context/native-events-context.js
@@ -60,9 +60,7 @@ ExecutionContext.prototype = {
     }
   },
 
-  triggerEvent(selector, container, options, eventName, eventOptions) {
-    const element = this.$(selector, container)[0];
-
+  triggerEvent(element, eventName, eventOptions) {
     // `keyCode` is a deprecated property.
     // @see: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/keyCode
     // Due to this deprecation `ember-native-dom-helpers` doesn't accept `keyCode` as a `KeyboardEvent` option.

diff --git a/addon-test-support/-private/execution_context/rfc268.js b/addon-test-support/-private/execution_context/rfc268.js
@@ -41,14 +41,14 @@ ExecutionContext.prototype = {
     return fillIn(selector, content);
   },
 
-  triggerEvent(selector, container, options, eventName, eventOptions) {
+  triggerEvent(element, eventName, eventOptions) {
     if (typeof eventOptions.key !== 'undefined' || typeof eventOptions.keyCode !== 'undefined') {
       const key = eventOptions.key || eventOptions.keyCode;
 
-      return this.invokeHelper(selector, options, triggerKeyEvent, eventName, key, eventOptions);
+      return triggerKeyEvent(element, eventName, key, eventOptions);
     }
 
-    return this.invokeHelper(selector, options, triggerEvent, eventName, eventOptions);
+    return triggerEvent(element, eventName, eventOptions);
   },
 
   focus(selector, options) {

diff --git a/addon-test-support/properties/triggerable.js b/addon-test-support/properties/triggerable.js
@@ -1,9 +1,6 @@
-import {
-  assign,
-  buildSelector,
-  findClosestValue
-} from '../-private/helpers';
-import { getExecutionContext } from '../-private/execution_context';
+import { action } from '../extend/index';
+import { assign } from '../-private/helpers';
+import run from '../-private/run';
 
 /**
  *
@@ -88,18 +85,13 @@ export function triggerable(event, selector, userOptions = {}) {
 
     get(key) {
       return function(eventProperties = {}) {
-        const executionContext = getExecutionContext(this);
         const options = assign({ pageObjectKey: `${key}()` }, userOptions);
-        const staticEventProperties = assign({}, options.eventProperties);
+        const mergedEventProperties = assign({}, options.eventProperties, eventProperties);
 
-        return executionContext.runAsync((context) => {
-          const fullSelector = buildSelector(this, selector, options);
-          const container =  options.testContainer || findClosestValue(this, 'testContainer');
-
-          context.assertElementExists(fullSelector, options);
-
-          const mergedEventProperties = assign(staticEventProperties, eventProperties);
-          return context.triggerEvent(fullSelector, container, options, event, mergedEventProperties);
+        return run(this, ({ triggerEvent }) => {
+          return action(this, selector, options,
+            (element) => triggerEvent(element, event, mergedEventProperties)
+          )
         });
       };
     }