Fix timeout in payment-is-showing.https.html (#18157)

danyao · web-flow · commit 1d05642f8266 · 2019-08-07T17:09:12.000-04:00
* popupShowPromise will never settle after popup navigates away. Remove promise_rejects

* Remove unnecessary console.log
diff --git a/payment-request/blank.html b/payment-request/blank.html
@@ -1 +1,16 @@
-<!DOCTYPE html> <meta charset="utf-8" />
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <title>Blank Page</title>
+    <script>
+      window.onload = function(event) {
+        // This is needed to ensure the onload event fires when this page is
+        // opened as a popup.
+        // See https://github.com/web-platform-tests/wpt/pull/18157
+      };
+    </script>
+  </head>
+  <body>
+  </body>
+</html>
diff --git a/payment-request/payment-is-showing.https.html b/payment-request/payment-is-showing.https.html
@@ -4,6 +4,7 @@
   rel="help"
   href="https://w3c.github.io/browser-payment-api/#dfn-payment-request-is-showing"
 />
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
@@ -399,31 +400,50 @@
     }, "Navigating an iframe as a nested browsing context sets 'payment request is showing boolean' to false.");
 
     promise_test(async t => {
-      const [popupWindow, popupRequest, showPromise] = await test_driver.bless(
-        'test navigating popup after show()',
-        async () => {
-          const popupWindow = await loadPopupInsideUserGesture();
-          const popupRequest = new popupWindow.PaymentRequest(methods, details);
-          return [popupWindow, popupRequest, popupRequest.show()];
-        },
-      );
+      const [popupWindow, popupRequest, popupShowPromise] =
+        await test_driver.bless(
+          'trigger payment in a popup window',
+          async () => {
+            const popupWindow = await loadPopupInsideUserGesture();
+            const popupRequest = new popupWindow.PaymentRequest(methods, details);
+            return [popupWindow, popupRequest, popupRequest.show()];
+          });
 
       // We navigate away, causing the payment sheet to close
       // and the request is showing boolean to become false.
       popupWindow.location = 'blank.html?abc=123';
       await new Promise(resolve => (popupWindow.onload = resolve));
-      await promise_rejects(
-        t,
-        'AbortError',
-        showPromise,
-        'Navigating away must cause the showPromise to reject with an AbortError',
-      );
-      popupWindow.close();
 
-      // Now we should be ok to spin up a new payment request.
+      // Don't wait for |popupShowPromise| to reject because it may never do
+      // (see https://github.com/w3c/payment-request/issues/872). Instead, try
+      // to spin up a new payment request and make sure it succeeds.
       const request = new window.PaymentRequest(methods, details);
-      request.show();
-      await request.abort();
+      const [showPromise] = await test_driver.bless(
+        'trigger payment in main window',
+        () => {
+          return [request.show()];
+        });
+
+      // If a payment sheet fails to show, it should reject immediately. If it
+      // hasn't rejected in 1 second, then the test has passed.
+      t.step_timeout(async () => {
+        // We're done. Clean up.
+        popupWindow.close();
+        await request.abort();
+        t.done();
+      }, 1000);
+
+      // If the navigation in popup window failed to close the original payment
+      // sheet there, |showPromise| should reject immediately and this indicates
+      // a failure of this test.
+      await showPromise.then(() => {
+        assert_true(false,
+          "Second payment sheet should be pending but is resolved.");
+      })
+      .catch(e => {
+        assert_true(false,
+          "Second payment sheet should be pending but is rejected.");
+      });
     }, "Navigating a popup as a nested browsing context sets 'payment request is showing boolean' to false.");
   </script>
 </body>
