[Payment Request] Some imported tests time out because they can't loa…

…d echo-PaymentRequest.html

https://bugs.webkit.org/show_bug.cgi?id=175611
rdar://125592721

Reviewed by Abrar Rahman Protyasha and Anne van Kesteren.

Resync WPT payment-request tests to upstream 1e5aba72c9.
The echo-PaymentRequest.html test, along with "allowpayment" and "allowpaymentrequest" directories, were removed from WPT some time ago.
The tests also received some updates to fix some issues and better match the spec.

So not to lose test coverage for "shipping" related things, imported in the tests from:
web-platform-tests/wpt#44409

We will eventually import those from WPT again once that PR is merged and the spec is updated to again include shipping.

And bring in Permission Policy fixes from, so we have coverage of the allow attribute:
web-platform-tests/wpt#45443

* LayoutTests/TestExpectations:
* LayoutTests/imported/w3c/resources/resource-files.json:
* LayoutTests/imported/w3c/web-platform-tests/payment-request/META.yml:
* LayoutTests/imported/w3c/web-platform-tests/payment-request/PaymentAddress/w3c-import.log: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/PaymentRequestUpdateEvent/constructor.https.html:
* LayoutTests/imported/w3c/web-platform-tests/payment-request/PaymentRequestUpdateEvent/updatewith-method.https.html:
* LayoutTests/imported/w3c/web-platform-tests/payment-request/PaymentValidationErrors/w3c-import.log: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpayment/active-document-cross-origin.https.sub-expected.txt: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpayment/active-document-cross-origin.https.sub.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpayment/active-document-same-origin.https-expected.txt: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpayment/active-document-same-origin.https.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpayment/allowpaymentrequest-attribute-cross-origin-bc-containers.https-expected.txt: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpayment/allowpaymentrequest-attribute-cross-origin-bc-containers.https.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpayment/common.sub.js: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpayment/echo-PaymentRequest.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpayment/no-attribute-cross-origin-bc-containers.https-expected.txt: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpayment/no-attribute-cross-origin-bc-containers.https.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpayment/no-attribute-same-origin-bc-containers.https-expected.txt: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpayment/no-attribute-same-origin-bc-containers.https.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpayment/removing-allowpaymentrequest.https.sub-expected.txt: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpayment/removing-allowpaymentrequest.https.sub.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpayment/setting-allowpaymentrequest.https.sub-expected.txt: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpayment/setting-allowpaymentrequest.https.sub.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpayment/w3c-import.log: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/active-document-cross-origin.https.sub-expected.txt: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/active-document-cross-origin.https.sub.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/active-document-same-origin.https-expected.txt: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/active-document-same-origin.https.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/allowpaymentrequest-attribute-cross-origin-bc-containers.https-expected.txt: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/allowpaymentrequest-attribute-cross-origin-bc-containers.https.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/allowpaymentrequest-attribute-same-origin-bc-containers.https-expected.txt: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/allowpaymentrequest-attribute-same-origin-bc-containers.https.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/basic.https-expected.txt: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/basic.https.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/common.sub.js: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/echo-PaymentRequest.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/no-attribute-cross-origin-bc-containers.https-expected.txt: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/no-attribute-cross-origin-bc-containers.https.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/no-attribute-same-origin-bc-containers.https-expected.txt: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/no-attribute-same-origin-bc-containers.https.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/removing-allowpaymentrequest.https.sub-expected.txt: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/removing-allowpaymentrequest.https.sub.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/setting-allowpaymentrequest-timing.https.sub-expected.txt: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/setting-allowpaymentrequest-timing.https.sub.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/setting-allowpaymentrequest.https.sub-expected.txt: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/setting-allowpaymentrequest.https.sub.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/w3c-import.log: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/blank.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/delegate-request.https.sub-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/delegate-request.https.sub.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/historical.https-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/payment-request/historical.https.html:
* LayoutTests/imported/w3c/web-platform-tests/payment-request/payment-is-showing.https.html:
* LayoutTests/imported/w3c/web-platform-tests/payment-request/payment-request-constructor-thcrash.https.html:
* LayoutTests/imported/w3c/web-platform-tests/payment-request/payment-request-constructor.https-expected.txt: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/payment-request-ctor-currency-code-checks.https-expected.txt: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/payment-request-ctor-pmi-handling.https-expected.txt: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/payment-request-ctor-pmi-handling.https.sub.html:
* LayoutTests/imported/w3c/web-platform-tests/payment-request/payment-request-disallowed-when-hidden.https-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/payment-request-disallowed-when-hidden.https.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/payment-request-show-method.https.html:
* LayoutTests/imported/w3c/web-platform-tests/payment-request/payment-request-update-event-constructor.http-expected.txt: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/payment-request-update-event-constructor.http.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/payment-request-update-event-constructor.https-expected.txt: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/payment-request-update-event-constructor.https.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/rejects_if_not_active.https.html:
* LayoutTests/imported/w3c/web-platform-tests/payment-request/resources/delegate-request-subframe.sub.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/payment-request/resources/w3c-import.log:
* LayoutTests/imported/w3c/web-platform-tests/payment-request/show-consume-activation.https-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/payment-request/show-consume-activation.https.html:
* LayoutTests/imported/w3c/web-platform-tests/payment-request/w3c-import.log:
* LayoutTests/imported/w3c/web-platform-tests/permissions-policy/payment-allowed-by-permissions-policy-attribute.https.sub-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/permissions-policy/payment-allowed-by-permissions-policy-attribute.https.sub.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/permissions-policy/payment-allowed-by-permissions-policy.https.sub-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/permissions-policy/payment-allowed-by-permissions-policy.https.sub.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/permissions-policy/payment-allowed-by-permissions-policy.https.sub.html.headers: Added.
* LayoutTests/imported/w3c/web-platform-tests/permissions-policy/payment-default-permissions-policy.https.sub-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/permissions-policy/payment-default-permissions-policy.https.sub.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/permissions-policy/payment-disabled-by-permissions-policy.https.sub-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/permissions-policy/payment-disabled-by-permissions-policy.https.sub.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/permissions-policy/payment-disabled-by-permissions-policy.https.sub.html.headers: Added.
* LayoutTests/imported/w3c/web-platform-tests/permissions-policy/payment-supported-by-permissions-policy.tentative-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/permissions-policy/payment-supported-by-permissions-policy.tentative.html: Added.
* LayoutTests/platform/glib/TestExpectations:
* LayoutTests/platform/ios/TestExpectations:
* LayoutTests/platform/mac-wk1/TestExpectations:
* LayoutTests/platform/mac-wk2/TestExpectations:
* LayoutTests/tests-options.json:

Canonical link: https://commits.webkit.org/276932@main

LayoutTests/TestExpectations

@@ -6239,11 +6239,9 @@ imported/w3c/web-platform-tests/paint-timing/fcp-only/fcp-out-of-bounds.html [ S
 imported/w3c/web-platform-tests/paint-timing/fcp-only/fcp-out-of-bounds-translate.html [ Skip ]
 imported/w3c/web-platform-tests/paint-timing/fcp-only/fcp-pseudo-element-visibility.html [ Skip ]
 imported/w3c/web-platform-tests/paint-timing/fcp-only/svg-in-iframe.html [ Skip ]
-imported/w3c/web-platform-tests/payment-request/allowpayment/allowpaymentrequest-attribute-cross-origin-bc-containers.https.html [ Skip ]
-imported/w3c/web-platform-tests/payment-request/allowpayment/no-attribute-cross-origin-bc-containers.https.html [ Skip ]
-imported/w3c/web-platform-tests/payment-request/allowpayment/removing-allowpaymentrequest.https.sub.html [ Skip ]
-imported/w3c/web-platform-tests/payment-request/allowpayment/setting-allowpaymentrequest.https.sub.html [ Skip ]
+imported/w3c/web-platform-tests/payment-request/delegate-request.https.sub.html [ Skip ]
 imported/w3c/web-platform-tests/payment-request/payment-is-showing.https.html [ Skip ]
+imported/w3c/web-platform-tests/payment-request/payment-request-disallowed-when-hidden.https.html [ Skip ]
 imported/w3c/web-platform-tests/permissions/permissions-query-feature-policy-attribute.https.sub.html [ Skip ]
 imported/w3c/web-platform-tests/pointerevents/pointerlock/pointerevent_pointermove_in_pointerlock.html [ Skip ]
 imported/w3c/web-platform-tests/pointerlock/mouse_buttons_back_forward.html [ Skip ]

LayoutTests/imported/w3c/resources/resource-files.json

@@ -7903,10 +7903,6 @@
         "web-platform-tests/mediacapture-streams/support/iframe-MediaStreamTrack-transfer-video.html",
         "web-platform-tests/mediacapture-streams/support/iframe-MediaStreamTrack-transfer.html",
         "web-platform-tests/mediasession/helper/artwork-generator.html",
-        "web-platform-tests/payment-request/allowpayment/echo-PaymentRequest.html",
-        "web-platform-tests/payment-request/allowpaymentrequest/echo-PaymentRequest.html",
-        "web-platform-tests/payment-request/blank.html",
-        "web-platform-tests/payment-request/payment-request-response-id.html",
         "web-platform-tests/payment-request/show-method-postmessage-iframe.html",
         "web-platform-tests/permissions/feature-policy-permissions-query.html",
         "web-platform-tests/quirks/body-fills-html-quirk-ref.html",

LayoutTests/imported/w3c/web-platform-tests/payment-request/META.yml

@@ -5,4 +5,3 @@ suggested_reviewers:
   - zouhir
   - romandev
   - aestes
-  - danyao

LayoutTests/imported/w3c/web-platform-tests/payment-request/PaymentRequestUpdateEvent/constructor.https.html

@@ -6,18 +6,8 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
-const applePay = Object.freeze({
-  supportedMethods: "https://apple.com/apple-pay",
-  data: {
-    version: 3,
-    merchantIdentifier: "merchant.com.example",
-    countryCode: "US",
-    merchantCapabilities: ["supports3DS"],
-    supportedNetworks: ["visa"],
-  }
-});
-const basicCard = Object.freeze({ supportedMethods: "basic-card" });
-const defaultMethods = Object.freeze([basicCard, applePay]);
+const examplePay = Object.freeze({ supportedMethods: "https://example.com/pay" });
+const defaultMethods = Object.freeze([examplePay]);
 const defaultDetails = Object.freeze({
   total: {
     label: "Total",

LayoutTests/imported/w3c/web-platform-tests/payment-request/PaymentRequestUpdateEvent/updatewith-method.https.html

@@ -6,18 +6,8 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
-const applePay = Object.freeze({
-  supportedMethods: "https://apple.com/apple-pay",
-  data: {
-    version: 3,
-    merchantIdentifier: "merchant.com.example",
-    countryCode: "US",
-    merchantCapabilities: ["supports3DS"],
-    supportedNetworks: ["visa"],
-  }
-});
-const basicCard = Object.freeze({ supportedMethods: "basic-card" });
-const defaultMethods = Object.freeze([basicCard, applePay]);
+const examplePay = Object.freeze({ supportedMethods: "https://example.com/pay" });
+const defaultMethods = Object.freeze([examplePay]);
 const defaultDetails = Object.freeze({
   total: {
     label: "Total",