feat: add eventTarget assertion

buschtoens · May 12, 2019 · 225fd2c · 225fd2c
1 parent 60d93e1
commit 225fd2c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/addon/helpers/on.js b/addon/helpers/on.js
@@ -38,6 +38,12 @@ const assertValidEventOptions =
 
 function setupListener(eventTarget, eventName, callback, eventOptions) {
   if (DEBUG) assertValidEventOptions(eventOptions, eventName);
+  assert(
+    `ember-on-helper: '${eventTarget}' is not a valid event target. It has to be an Element or an object that conforms to the EventTarget interface.`,
+    eventTarget &&
+      typeof eventTarget.addEventListener === 'function' &&
+      typeof eventTarget.removeEventListener === 'function'
+  );
   assert(
     `ember-on-helper: '${eventName}' is not a valid event name. It has to be a string with a minimum length of 1 character.`,
     typeof eventName === 'string' && eventName.length > 1

diff --git a/tests/integration/helpers/on-test.js b/tests/integration/helpers/on-test.js
@@ -233,6 +233,8 @@ module('Integration | Helper | on', function(hooks) {
     await testExpression(`{{on this.testElement "click"}}`);
     await testExpression(`{{on this.testElement "" undefined}}`);
     await testExpression(`{{on this.testElement 10 undefined}}`);
+    await testExpression(`{{on this.testElement}}`);
+    await testExpression(`{{on null 10 undefined}}`);
     await testExpression(`{{on}}`);
 
     assert.counts({ adds: 0, removes: 0 });
@@ -242,7 +244,9 @@ module('Integration | Helper | on', function(hooks) {
       "Assertion Failed: ember-on-helper: 'undefined' is not a valid callback. Provide a function.",
       "Assertion Failed: ember-on-helper: '' is not a valid event name. It has to be a string with a minimum length of 1 character.",
       "Assertion Failed: ember-on-helper: '10' is not a valid event name. It has to be a string with a minimum length of 1 character.",
-      "Assertion Failed: ember-on-helper: 'undefined' is not a valid event name. It has to be a string with a minimum length of 1 character."
+      "Assertion Failed: ember-on-helper: 'undefined' is not a valid event name. It has to be a string with a minimum length of 1 character.",
+      "Assertion Failed: ember-on-helper: 'null' is not a valid event target. It has to be an Element or an object that conforms to the EventTarget interface.",
+      "Assertion Failed: ember-on-helper: 'undefined' is not a valid event target. It has to be an Element or an object that conforms to the EventTarget interface."
     ]);
   });