From 5490e8565c5127aa886559b6811d5d4ae455f424 Mon Sep 17 00:00:00 2001
From: Jon Perl <perl.jonathan@gmail.com>
Date: Sun, 12 Jul 2020 17:27:34 -0600
Subject: [PATCH] ContextEventCollector: do not ignore unsafe errors

---
 src/create-code/ContextEventCollector.ts | 38 ++++++++++--------------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/src/create-code/ContextEventCollector.ts b/src/create-code/ContextEventCollector.ts
index 758dc02ba..e6261460e 100644
--- a/src/create-code/ContextEventCollector.ts
+++ b/src/create-code/ContextEventCollector.ts
@@ -36,21 +36,15 @@ export class ContextEventCollector extends EventEmitter {
   async _start(): Promise<void> {
     await indexPages(this._context);
 
-    try {
-      await this._context.exposeBinding(
-        'qawElementEvent',
-        ({ page }, elementEvent: ElementEvent) => {
-          const pageIndex = (page as IndexedPage).createdIndex;
-          const event: ElementEvent = { ...elementEvent, page: pageIndex };
-          debug(`emit %j`, event);
-          this.emit('elementevent', event);
-        },
-      );
-    } catch (error) {
-      if (!ignoreError(error)) throw error;
-
-      debug('exposeBinding error we ignored: ' + error.message);
-    }
+    await this._context.exposeBinding(
+      'qawElementEvent',
+      ({ page }, elementEvent: ElementEvent) => {
+        const pageIndex = (page as IndexedPage).createdIndex;
+        const event: ElementEvent = { ...elementEvent, page: pageIndex };
+        debug(`emit %j`, event);
+        this.emit('elementevent', event);
+      },
+    );
 
     const script =
       '(() => {\n' +
@@ -61,23 +55,21 @@ export class ContextEventCollector extends EventEmitter {
       '})();';
 
     try {
-      await this._context.addInitScript(script);
+      await Promise.all(
+        this._context.pages().map((page) => page.evaluate(script)),
+      );
     } catch (error) {
       if (!ignoreError(error)) throw error;
 
-      debug('addInitScript error we ignored: ' + error.message);
+      debug('evaluate error we ignored: ' + error.message);
     }
 
     try {
-      await Promise.all(
-        this._context.pages().map((page) => {
-          page.evaluate(script);
-        }),
-      );
+      await this._context.addInitScript(script);
     } catch (error) {
       if (!ignoreError(error)) throw error;
 
-      debug('page.evaluate error we ignored: ' + error.message);
+      debug('addInitScript error we ignored: ' + error.message);
     }
   }
 }