Revert "Remove shipping related things from payment-request (#28830)" #44409
Merged
marcoscaceres merged 3 commits intomasterfrom Apr 2, 2024
Merged
Revert "Remove shipping related things from payment-request (#28830)" #44409marcoscaceres merged 3 commits intomasterfrom
marcoscaceres merged 3 commits intomasterfrom
Conversation
Merged
7 tasks
Contributor
Author
|
@rsolomakhin, @stephenmcgruer, just have a quick check we don't need to update anything else here. |
rsolomakhin
approved these changes
Feb 13, 2024
Contributor
rsolomakhin
left a comment
There was a problem hiding this comment.
Overall LGTM % a few nits and questions here and there. Nothing blocking.
| @@ -0,0 +1,109 @@ | |||
| <!doctype html> | |||
Contributor
There was a problem hiding this comment.
Should this directory be renamed to ContactAddress?
payment-request/PaymentRequestUpdateEvent/updateWith-call-immediate-manual.https.html
Show resolved
Hide resolved
| supportedNetworks: ["visa"], | ||
| } | ||
| }); | ||
| const validMethod = Object.freeze({ supportedMethods: "basic-card" }); |
Contributor
There was a problem hiding this comment.
Not sure if it makes a difference, but Chrome has deprecated "basic-card". We only support payment handlers now, such as "https://google.com/pay".
We also deprecated manual install of payment handlers. Only just-in-time install is supported.
What that means for our tests is that we setup a JIT-installable payment handler at some local URL and then point our tests to it as the supportedMethods.
I think it's OK to re-land these tests as-is, but let's keep in mind that validMethod may need to change before it works in Chrome correctly.
Contributor
There was a problem hiding this comment.
OK, let's add https://google.com/pay. Our team can follow up later to pass the correct method-specific-data to make Google Pay work in tests, too.
Contributor
Author
There was a problem hiding this comment.
that would be great!
marcoscaceres
commented
Feb 23, 2024
Contributor
Author
|
Ok, I'll get rid of some of the basic card stuff... and need to rename some files it seems too. |
webkit-commit-queue
pushed a commit
to marcoscaceres/WebKit
that referenced
this pull request
Apr 2, 2024
…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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Bring back tests for w3c/payment-request#996