Skip to content

Commit

Permalink
Many PaymentRequest tests are now passing
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=266330
rdar://119599179

Unreviewed test expectations gardening.

A lot of tests under `http/tests/paymentrequest/` were previously skipped
on both macOS and iOS because they tested for features yet to be
available in public versions of PassKit. This is no longer the case, so
we can safely unskip these tests. The only kink comes from having to
single out some tests to skip on macOS Monterey. These tests happen to be
testing features available from macOS Ventura-onwards only.

Some more tests still do not require the DumpJSConsoleLogInStdErr
classification, either because they are not producing JS console logs or
because their expectations have been rebaselined to reflect the console
log. We also unskip these tests.

* LayoutTests/platform/ios-wk2/TestExpectations:
* LayoutTests/platform/mac-monterey-wk2/TestExpectations:
* LayoutTests/platform/mac-ventura-wk2/TestExpectations:
* LayoutTests/platform/mac-wk2/TestExpectations:

Canonical link: https://commits.webkit.org/272027@main
  • Loading branch information
aprotyas committed Dec 14, 2023
1 parent 845bcf1 commit b780dce
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 56 deletions.
24 changes: 1 addition & 23 deletions LayoutTests/platform/ios-wk2/TestExpectations
Original file line number Diff line number Diff line change
Expand Up @@ -84,19 +84,6 @@ http/tests/ssl/applepay [ Pass ]
webkit.org/b/212975 http/tests/ssl/applepay/PaymentRequest.https.html [ Pass Timeout ]

http/tests/paymentrequest [ Pass ]
http/tests/paymentrequest/ApplePayModifier-automaticReloadPaymentRequest.https.html [ Skip ]
http/tests/paymentrequest/ApplePayModifier-additionalLineItems.https.html [ Skip ]
http/tests/paymentrequest/ApplePayModifier-additionalShippingMethods.https.html [ Skip ]
http/tests/paymentrequest/ApplePayModifier-deferredPaymentRequest.https.html [ Skip ]
http/tests/paymentrequest/ApplePayModifier-multiTokenContexts.https.html [ Skip ]
http/tests/paymentrequest/ApplePayModifier-recurringPaymentRequest.https.html [ Skip ]
http/tests/paymentrequest/ApplePayModifier-total.https.html [ Skip ]
http/tests/paymentrequest/ApplePayPaymentCompleteDetails-orderDetails.https.html [ Skip ]
http/tests/paymentrequest/paymentmethodchange-couponCode.https.html [ Skip ]
http/tests/paymentrequest/paymentrequest-applePayLaterAvailability.https.html [ Skip ]
http/tests/paymentrequest/paymentrequest-couponCode.https.html [ Skip ]
http/tests/paymentrequest/paymentrequest-shippingContactEditingMode.https.html [ Skip ]
http/tests/paymentrequest/paymentrequest-supportsCouponCode.https.html [ Skip ]
imported/w3c/web-platform-tests/payment-request [ Pass ]
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 ]
Expand All @@ -107,8 +94,7 @@ webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpayment
webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpayment/no-attribute-cross-origin-bc-containers.https.html [ Skip ]
webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpayment/removing-allowpaymentrequest.https.sub.html [ Skip ]
webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpayment/setting-allowpaymentrequest.https.sub.html [ Skip ]
imported/w3c/web-platform-tests/payment-request/payment-request-canmakepayment-method.https.html [ Skip ]
imported/w3c/web-platform-tests/payment-request/payment-request-hasenrolledinstrument-method.tentative.https.html [ Skip ]
imported/w3c/web-platform-tests/payment-request/payment-request-hasenrolledinstrument-method.tentative.https.html [ DumpJSConsoleLogInStdErr ]
imported/w3c/web-platform-tests/payment-request/show-method-optional-promise-rejects.https.html [ DumpJSConsoleLogInStdErr ]

# This test is failing due to lack of user activation.
Expand Down Expand Up @@ -1027,14 +1013,6 @@ fast/images/animated-gif-webkit-transform.html

webkit.org/b/145432 media/video-transformed-by-javascript.html [ Failure ]

# webkit.org/b/238908 Global expectations for these until baselines are resolved
http/tests/paymentrequest/payment-address-attributes-and-toJSON-method.https.html [ DumpJSConsoleLogInStdErr ]
http/tests/paymentrequest/payment-request-change-shipping-option.https.html [ DumpJSConsoleLogInStdErr ]
http/tests/paymentrequest/payment-response-retry-method.https.html [ DumpJSConsoleLogInStdErr ]
http/tests/paymentrequest/updateWith-shippingOptions.https.html [ DumpJSConsoleLogInStdErr Pass Failure ]
imported/w3c/web-platform-tests/payment-request/payment-request-constructor.https.sub.html [ DumpJSConsoleLogInStdErr ]
imported/w3c/web-platform-tests/payment-request/payment-request-shippingOption-attribute.https.html [ DumpJSConsoleLogInStdErr ]

# Latest iOS failures as of Sept 1, 2015
webkit.org/b/149087 http/tests/cache/disk-cache/disk-cache-validation-back-navigation-policy.html [ Pass Timeout ]
platform/ios/ios/fast/coordinates/document-elementFromPoint.html [ Failure Pass ]
Expand Down
7 changes: 7 additions & 0 deletions LayoutTests/platform/mac-monterey-wk2/TestExpectations
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,10 @@ swipe/pushState-cached-back-swipe.html [ Pass Timeout ]

# Asserts on pre-Sonoma macOS: rdar://116291539
[ Debug ] http/tests/site-isolation/window-properties.html [ Skip ]

# These features were introduced in macOS Ventura.
http/tests/paymentrequest/ApplePayModifier-automaticReloadPaymentRequest.https.html [ Skip ]
http/tests/paymentrequest/ApplePayModifier-deferredPaymentRequest.https.html [ Skip ]
http/tests/paymentrequest/ApplePayModifier-multiTokenContexts.https.html [ Skip ]
http/tests/paymentrequest/ApplePayModifier-recurringPaymentRequest.https.html [ Skip ]
http/tests/paymentrequest/ApplePayPaymentCompleteDetails-orderDetails.https.html [ Skip ]
3 changes: 3 additions & 0 deletions LayoutTests/platform/mac-ventura-wk2/TestExpectations
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,6 @@ webkit.org/b/261444 [ Debug x86_64 ] http/tests/security/referrer-policy-header.

# webkit.org/b/263955 Twelve css WPTs are failing with async overflow scrolling enabled on macOS
imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-smooth-positions.html [ Failure ]

# This feature was introduced in macOS Sonoma.
http/tests/paymentrequest/paymentrequest-applePayLaterAvailability.https.html [ Skip ]
33 changes: 0 additions & 33 deletions LayoutTests/platform/mac-wk2/TestExpectations
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,6 @@ fast/visual-viewport/rubberbanding-viewport-rects-header-footer.html [ Pass ]
webkit.org/b/229423 [ BigSur Debug arm64 ] http/tests/paymentrequest/payment-response-reference-cycle-leak.https.html [ Pass Crash ]

http/tests/paymentrequest [ Pass ]
http/tests/paymentrequest/ApplePayModifier-automaticReloadPaymentRequest.https.html [ Skip ]
http/tests/paymentrequest/ApplePayModifier-multiTokenContexts.https.html [ Skip ]
http/tests/paymentrequest/ApplePayModifier-additionalLineItems.https.html [ Skip ]
http/tests/paymentrequest/ApplePayModifier-additionalShippingMethods.https.html [ Skip ]
http/tests/paymentrequest/ApplePayModifier-deferredPaymentRequest.https.html [ Skip ]
http/tests/paymentrequest/ApplePayModifier-recurringPaymentRequest.https.html [ Skip ]
http/tests/paymentrequest/ApplePayModifier-total.https.html [ Skip ]
http/tests/paymentrequest/ApplePayPaymentCompleteDetails-orderDetails.https.html [ Skip ]
http/tests/paymentrequest/paymentrequest-applePayLaterAvailability.https.html [ Skip ]
http/tests/paymentrequest/paymentmethodchange-couponCode.https.html [ Skip ]
http/tests/paymentrequest/paymentrequest-couponCode.https.html [ Skip ]
http/tests/paymentrequest/paymentrequest-shippingContactEditingMode.https.html [ Skip ]
http/tests/paymentrequest/paymentrequest-supportsCouponCode.https.html [ Skip ]
http/tests/inspector/paymentrequest [ Pass ]
imported/w3c/web-platform-tests/payment-request [ Pass ]
webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/allowpaymentrequest-attribute-cross-origin-bc-containers.https.html [ Skip ]
Expand All @@ -90,8 +77,6 @@ webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpayment
webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpayment/removing-allowpaymentrequest.https.sub.html [ Skip ]
webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpayment/setting-allowpaymentrequest.https.sub.html [ Skip ]
imported/w3c/web-platform-tests/payment-request/payment-request-hasenrolledinstrument-method.tentative.https.html [ DumpJSConsoleLogInStdErr ]
imported/w3c/web-platform-tests/payment-request/payment-request-canmakepayment-method.https.html [ DumpJSConsoleLogInStdErr ]
imported/w3c/web-platform-tests/payment-request/show-method-optional-promise-rejects.https.html [ DumpJSConsoleLogInStdErr ]

# These tests are checking that WebContent is terminated when performing an invalid IPC operation for WK2.
# They crash in debug (as expected) so we skip them there. <rdar://problem/117742950>
Expand Down Expand Up @@ -567,15 +552,6 @@ webkit.org/b/139820 fast/frames/lots-of-iframes.html [ Pass Timeout ]

webkit.org/b/145432 media/video-transformed-by-javascript.html [ Failure ]

# webkit.org/b/238908 Global expectations for these until baselines are resolved
http/tests/paymentrequest/payment-address-attributes-and-toJSON-method.https.html [ DumpJSConsoleLogInStdErr ]
http/tests/inspector/paymentrequest/payment-request-internal-properties.https.html [ DumpJSConsoleLogInStdErr ]
http/tests/paymentrequest/payment-request-change-shipping-option.https.html [ DumpJSConsoleLogInStdErr ]
http/tests/paymentrequest/payment-response-retry-method.https.html [ DumpJSConsoleLogInStdErr ]
http/tests/paymentrequest/updateWith-shippingOptions.https.html [ DumpJSConsoleLogInStdErr ]
imported/w3c/web-platform-tests/payment-request/payment-request-constructor.https.sub.html [ DumpJSConsoleLogInStdErr ]
imported/w3c/web-platform-tests/payment-request/payment-request-shippingOption-attribute.https.html [ DumpJSConsoleLogInStdErr ]

# A lot of the disk-cache tests are flaky on mac-wk2
webkit.org/b/149087 [ Debug ] http/tests/cache/disk-cache/disk-cache-validation-no-body.html [ Pass Failure Timeout ]
webkit.org/b/149087 [ Debug ] http/tests/cache/disk-cache/disk-cache-validation.html [ Pass Failure Timeout ]
Expand Down Expand Up @@ -893,15 +869,6 @@ webkit.org/b/185994 fast/text/user-installed-fonts/shadow-postscript-family.html
fast/text/user-installed-fonts/extended-character.html [ Pass ]
fast/text/user-installed-fonts/extended-character-with-user-font.html [ Pass ]

# <rdar://problem/25010307>
http/tests/ssl/applepay/ApplePayError.html [ Pass ]
http/tests/ssl/applepay/ApplePaySessionV3.html [ Pass ]
http/tests/ssl/applepay/ApplePaySessionV4.html [ Pass ]
http/tests/ssl/applepay/ApplePaySessionV5.html [ Pass ]
http/tests/ssl/applepay/ApplePayRequestShippingContactV3.https.html [ Pass ]
http/tests/ssl/applepay/ApplePayShippingAddressChangeEventErrorsV3.https.html [ Pass ]
accessibility/mac/apple-pay-labels.html [ Pass ]
accessibility/mac/apple-pay-session-v4.html [ Pass ]
# <rdar://problem/31634451>
http/tests/resourceLoadStatistics/cookies-with-and-without-user-interaction.html [ Pass ]
http/tests/resourceLoadStatistics/cookie-deletion.html [ Pass ]
Expand Down

0 comments on commit b780dce

Please sign in to comment.