Modified: branches/safari-605-branch/LayoutTests/ChangeLog (227389 => 227390)
--- branches/safari-605-branch/LayoutTests/ChangeLog 2018-01-23 04:08:36 UTC (rev 227389)
+++ branches/safari-605-branch/LayoutTests/ChangeLog 2018-01-23 04:08:39 UTC (rev 227390)
@@ -1,5 +1,23 @@
2018-01-22 Jason Marcell <jmarc...@apple.com>
+ Cherry-pick r227338. rdar://problem/36746095
+
+ 2018-01-22 Andy Estes <aes...@apple.com>
+
+ LayoutTest http/tests/paymentrequest/payment-request-abort-method.https.html is a flaky failure
+ https://bugs.webkit.org/show_bug.cgi?id=178107
+ <rdar://problem/34901064>
+
+ Reviewed by Brady Eidson.
+
+ Modified the test to call show() with user activation.
+
+ * http/tests/paymentrequest/payment-request-abort-method.https.html:
+ * platform/ios-wk2/TestExpectations:
+ * platform/mac-wk2/TestExpectations:
+
+2018-01-22 Jason Marcell <jmarc...@apple.com>
+
Cherry-pick r227339. rdar://problem/36745908
2018-01-22 Youenn Fablet <you...@apple.com>
Modified: branches/safari-605-branch/LayoutTests/http/tests/paymentrequest/payment-request-abort-method.https.html (227389 => 227390)
--- branches/safari-605-branch/LayoutTests/http/tests/paymentrequest/payment-request-abort-method.https.html 2018-01-23 04:08:36 UTC (rev 227389)
+++ branches/safari-605-branch/LayoutTests/http/tests/paymentrequest/payment-request-abort-method.https.html 2018-01-23 04:08:39 UTC (rev 227390)
@@ -5,8 +5,11 @@
<meta charset="utf-8">
<title>Test for PaymentRequest.abort() method</title>
<link rel="help" href=""
+<script src=""
+<script src=""
<script src=""
<script src=""
+<body>
<script>
"use strict";
setup(() => {}, {
@@ -49,18 +52,20 @@
await promise_rejects(t, "InvalidStateError", request.abort());
// The request's state is "created", so let's show it
// which changes the state to "interactive.".
- request.show();
- // Let's set request the state to "closed" by calling .abort()
- try {
- await request.abort();
- } catch (err) {
- assert_true(false, "Unexpected promise rejection: " + err.message);
- }
+ await activateThen(async () => {
+ request.show().catch((error) => { });
+ // Let's set request the state to "closed" by calling .abort()
+ try {
+ await request.abort();
+ } catch (err) {
+ assert_true(false, "Unexpected promise rejection: " + err.message);
+ }
+ });
// The request is now "closed", so...
await promise_rejects(t, "InvalidStateError", request.abort());
}, `Calling abort must not change the [[state]] until after "interactive"`);
-promise_test(async t => {
+user_activation_test(async t => {
const request = new PaymentRequest(defaultMethods, defaultDetails);
const acceptPromise = request.show();
try {
@@ -70,7 +75,9 @@
}
await promise_rejects(t, "AbortError", acceptPromise);
// As request is now "closed", trying to show it will fail
- await promise_rejects(t, "InvalidStateError", request.show());
+ await activateThen(async () => {
+ await promise_rejects(t, "InvalidStateError", request.show());
+ });
}, "calling .abort() causes acceptPromise to reject and closes the request.");
</script>
Modified: branches/safari-605-branch/LayoutTests/platform/ios-wk2/TestExpectations (227389 => 227390)
--- branches/safari-605-branch/LayoutTests/platform/ios-wk2/TestExpectations 2018-01-23 04:08:36 UTC (rev 227389)
+++ branches/safari-605-branch/LayoutTests/platform/ios-wk2/TestExpectations 2018-01-23 04:08:39 UTC (rev 227390)
@@ -32,7 +32,6 @@
http/tests/paymentrequest [ Pass ]
imported/w3c/web-platform-tests/payment-request [ Pass ]
-webkit.org/b/178107 http/tests/paymentrequest/payment-request-abort-method.https.html [ Pass Failure ]
webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/allowpaymentrequest-attribute-cross-origin-bc-containers.https.html [ Skip ]
webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/no-attribute-cross-origin-bc-containers.https.html [ Skip ]
webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/removing-allowpaymentrequest.https.sub.html [ Skip ]
Modified: branches/safari-605-branch/LayoutTests/platform/mac-wk2/TestExpectations (227389 => 227390)
--- branches/safari-605-branch/LayoutTests/platform/mac-wk2/TestExpectations 2018-01-23 04:08:36 UTC (rev 227389)
+++ branches/safari-605-branch/LayoutTests/platform/mac-wk2/TestExpectations 2018-01-23 04:08:39 UTC (rev 227390)
@@ -30,7 +30,6 @@
[ Sierra+ ] http/tests/paymentrequest [ Pass ]
[ Sierra+ ] http/tests/inspector/paymentrequest [ Pass ]
[ Sierra+ ] imported/w3c/web-platform-tests/payment-request [ Pass ]
-webkit.org/b/178107 [ Sierra+ ] http/tests/paymentrequest/payment-request-abort-method.https.html [ Pass Failure ]
webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/allowpaymentrequest-attribute-cross-origin-bc-containers.https.html [ Skip ]
webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/no-attribute-cross-origin-bc-containers.https.html [ Skip ]
webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/removing-allowpaymentrequest.https.sub.html [ Skip ]
