From 4b7144c3a5101f2d6ddde7f692b4fd942dae44db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20C=C3=A1ceres?= Date: Fri, 24 Jul 2020 05:14:04 +0000 Subject: [PATCH] Bug 1654227 - enable WPT + mochitests again for Web Payments r=kamidphish Re-enable the tests... there are some painful fails but we should deal with them on a case by case basis. Differential Revision: https://phabricator.services.mozilla.com/D84332 --- dom/payments/PaymentRequest.cpp | 2 +- dom/payments/test/mochitest.ini | 2 +- dom/payments/test/test_abortPayment.html | 86 ++++++------ dom/payments/test/test_closePayment.html | 130 +++++++----------- .../meta/payment-request/__dir__.ini | 2 - ...e-document-cross-origin.https.sub.html.ini | 2 +- ...active-document-same-origin.https.html.ini | 3 +- ...ing-allowpaymentrequest.https.sub.html.ini | 3 +- ...owpaymentrequest-timing.https.sub.html.ini | 5 + ...ing-allowpaymentrequest.https.sub.html.ini | 4 +- .../idlharness.https.window.js.ini | 7 + .../payment-request/interfaces.https.html.ini | 8 ++ .../payment-is-showing.https.html.ini | 2 +- ...ayment-request-abort-method.https.html.ini | 9 +- ...instrument-method.tentative.https.html.ini | 1 + ...payment-request-show-method.https.html.ini | 17 +++ ...lledinstrument-method.tentative.https.html | 3 + .../payment-request-show-method.https.html | 3 + 18 files changed, 147 insertions(+), 142 deletions(-) create mode 100644 testing/web-platform/meta/payment-request/allowpaymentrequest/setting-allowpaymentrequest-timing.https.sub.html.ini create mode 100644 testing/web-platform/meta/payment-request/interfaces.https.html.ini create mode 100644 testing/web-platform/meta/payment-request/payment-request-show-method.https.html.ini diff --git a/dom/payments/PaymentRequest.cpp b/dom/payments/PaymentRequest.cpp index 79dd4e7c8459..de09c38b59f5 100644 --- a/dom/payments/PaymentRequest.cpp +++ b/dom/payments/PaymentRequest.cpp @@ -832,7 +832,7 @@ already_AddRefed PaymentRequest::Abort(ErrorResult& aRv) { } if (mState != eInteractive) { - aRv.ThrowSecurityError( + aRv.ThrowInvalidStateError( "The PaymentRequest's state should be 'Interactive'"); return nullptr; } diff --git a/dom/payments/test/mochitest.ini b/dom/payments/test/mochitest.ini index f2a7a6028436..919a7b3a7380 100644 --- a/dom/payments/test/mochitest.ini +++ b/dom/payments/test/mochitest.ini @@ -3,7 +3,7 @@ prefs = dom.payments.request.enabled=true # skip-if !e10s will be removed once non-e10s is supported # Android crashes on nearly all tests, bug 1525959 -skip-if = !e10s || !nightly_build || toolkit == 'android' || true # we don't ship webpayments right now bug 1514425 +skip-if = !e10s || !nightly_build || toolkit == 'android' scheme = https support-files = blank_page.html diff --git a/dom/payments/test/test_abortPayment.html b/dom/payments/test/test_abortPayment.html index 64285914aaa7..790efdbc95f2 100644 --- a/dom/payments/test/test_abortPayment.html +++ b/dom/payments/test/test_abortPayment.html @@ -8,9 +8,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1345367 Test for Bug 1345367 - diff --git a/dom/payments/test/test_closePayment.html b/dom/payments/test/test_closePayment.html index a5d8b49deeb5..db0b9648da32 100644 --- a/dom/payments/test/test_closePayment.html +++ b/dom/payments/test/test_closePayment.html @@ -8,10 +8,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1408234 Test for closing PaymentRequest - - +