Fix EventListener once handling

Don't use array indexes from snapshot since we're modifying in-loop
jsdom · Dec 18, 2016 · 8bb591d · 8bb591d
1 parent 45f4458
commit 8bb591d
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 1 deletion.
diff --git a/lib/jsdom/living/events/EventTarget-impl.js b/lib/jsdom/living/events/EventTarget-impl.js
@@ -207,7 +207,7 @@ function invokeEventListeners(listeners, target, eventImpl) {
     }
 
     if (once) {
-      listeners.splice(i, 1);
+      listeners.splice(listeners.indexOf(listener), 1);
     }
 
     try {

diff --git a/test/web-platform-tests/to-upstream.js b/test/web-platform-tests/to-upstream.js
@@ -10,6 +10,7 @@ describe("Local tests in Web Platform Test format (to-upstream)", () => {
     "console/methods.html",
     "dom/attributes-are-not-nodes.html",
     "dom/collections/HTMLCollection-iterator.html",
+    "dom/events/AddEventListenerOptions-once.html",
     "dom/events/EventTarget-add-remove-listener.html",
     "dom/events/EventTarget-prototype-constructor.html",
     "dom/events/EventTarget-this-of-listener.html",

diff --git a/test/web-platform-tests/to-upstream/dom/events/AddEventListenerOptions-once.html b/test/web-platform-tests/to-upstream/dom/events/AddEventListenerOptions-once.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>AddEventListenerOptions.once</title>
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-addeventlisteneroptions-once">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+"use strict";
+
+test(() => {
+  let invoked_once = false;
+  let invoked_once2 = false;
+  let invoked_normal = false;
+  function handler_once() {
+    invoked_once = true;
+  }
+  function handler_once2() {
+    invoked_once2 = true;
+  }
+  function handler_normal() {
+    invoked_normal = true;
+  }
+
+  document.addEventListener("test", handler_once, { once: true });
+  document.addEventListener("test", handler_once2, { once: true });
+  document.addEventListener("test", handler_normal);
+  document.dispatchEvent(new Event("test"));
+  assert_equals(invoked_once, true, "Once handler should be invoked");
+  assert_equals(invoked_once2, true, "Once2 handler should be invoked");
+  assert_equals(invoked_normal, true, "Normal handler should be invoked");
+
+  invoked_once = false;
+  invoked_once2 = false;
+  invoked_normal = false;
+  document.dispatchEvent(new Event("test"));
+  assert_equals(invoked_once, false, "Once handler shouldn't be invoked again");
+  assert_equals(invoked_once2, false, "Once2 handler shouldn't be invoked again");
+  assert_equals(invoked_normal, true, "Normal handler should be invoked again");
+  document.removeEventListener("test", handler_normal);
+}, "Once listener should be invoked only once");
+
+</script>