fix: do not throw on removeListener without listener

microsoft · Jun 29, 2022 · 4ab0549 · 4ab0549
1 parent 8220ab1
commit 4ab0549
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/packages/playwright-core/src/client/joiningEventEmitter.ts b/packages/playwright-core/src/client/joiningEventEmitter.ts
@@ -119,7 +119,11 @@ export class JoiningEventEmitter implements EventEmitter {
   }
 
   private _wrapper(listener: (...args: any[]) => void) {
-    return (listener as any)[wrapperListener];
+    const wrapped = (listener as any)[wrapperListener];
+    // Fallback to original listener if not wrapped to ensure backwards compatibility Node.js's event emitter
+    if (!wrapped)
+      return listener;
+    return wrapped;
   }
 
   private _original(wrapper: Function): Function {

diff --git a/tests/page/page-event-pageerror.spec.ts b/tests/page/page-event-pageerror.spec.ts
@@ -128,3 +128,7 @@ it('should handle window', async ({ page, browserName, isElectron }) => {
   ]);
   expect(error.message).toBe(browserName === 'chromium' ? 'Window' : '[object Window]');
 });
+
+it('should remove a listener of a non-existend event handler', async ({ page }) => {
+  page.removeListener('pageerror', () => {});
+});