commit f81ca20666e38be61f0945344a113be7a9771c2f
author Leandro Lovisolo <lovisolo@google.com> Tue Nov 19 16:50:21 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Nov 19 22:08:06 2019 +0000
tree dda19fbb8c3bd176322a6d64308dc6483fd283fd
parent 3fc469da1a98f1e394ddf447fed3fe8873dcbcd2

[gold] Use eventPromise in triagelog-page-sk_test.js.

Bug: skia:9525
Change-Id: I0a7afc4a42064ab34500ae9d0820fe69844edc69
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/255145
Commit-Queue: Leandro Lovisolo <lovisolo@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>

golden/modules/triagelog-page-sk/triagelog-page-sk_test.js

diff --git a/golden/modules/triagelog-page-sk/triagelog-page-sk_test.js b/golden/modules/triagelog-page-sk/triagelog-page-sk_test.js
index 042870e..f80bd36 100644
--- a/golden/modules/triagelog-page-sk/triagelog-page-sk_test.js
+++ b/golden/modules/triagelog-page-sk/triagelog-page-sk_test.js
@@ -8,7 +8,7 @@
   secondPage,
   secondPageWithDetails
 } from './test_data'
-import { expectNoUnmatchedCalls } from '../test_util'
+import { eventPromise, expectNoUnmatchedCalls } from '../test_util'
 import { fetchMock } from 'fetch-mock';
 
 fetchMock.config.overwriteRoutes = true;
@@ -416,7 +416,7 @@
   //
   // The promise will be rejected if the event isn't caught within 5 seconds.
   function endTaskEvent(fn) {
-    const promise = newEventPromise('end-task');
+    const promise = eventPromise('end-task');
     fn();
     return promise;
   }
@@ -426,30 +426,9 @@
   //
   // The promise will be rejected if the event isn't caught within 5 seconds.
   function fetchErrorEvent(fn) {
-    const promise = newEventPromise('fetch-error');
+    const promise = eventPromise('fetch-error');
     fn();
     return promise;
   }
 
-  // Returns a promise that will resolve when the given event is caught, or
-  // reject if the event isn't caught within the given amount of time.
-  function newEventPromise(event, timeoutMillis = 5000) {
-    // The executor function passed as a constructor argument to the Promise
-    // object is executed immediately. This guarantees that the event handler
-    // is added to document.body before returning.
-    return new Promise((resolve, reject) => {
-      const handler = (e) => {
-        document.body.removeEventListener(event, handler);
-        clearTimeout(timeout);
-        resolve(e);
-      };
-      const timeout = setTimeout(() => {
-        document.body.removeEventListener(event, handler);
-        reject(new Error(`timed out after ${timeoutMillis} ms ` +
-                         `while waiting to catch event "${event}"`));
-      }, timeoutMillis);
-      document.body.addEventListener(event, handler);
-    });
-  }
-
 });