Backed out 2 changesets (bug 1487295) for WPT failres in payment-request/PaymentMethodChangeEvent/methodDetails-attribute.https.html

Backed out changeset 33cb5cf879d8 (bug 1487295)
Backed out changeset b5657f72bcb0 (bug 1487295)

dom/payments/PaymentMethodChangeEvent.cpp

@@ -72,7 +72,9 @@ PaymentMethodChangeEvent::init(
   const PaymentMethodChangeEventInit& aEventInitDict)
 {
   mMethodName.Assign(aEventInitDict.mMethodName);
-  mMethodDetails = aEventInitDict.mMethodDetails;
+  if (aEventInitDict.mMethodDetails.WasPassed()) {
+    mMethodDetails = aEventInitDict.mMethodDetails.Value();
+  }
 }
 
 void

dom/payments/PaymentMethodChangeEvent.h

@@ -14,7 +14,6 @@
 namespace mozilla {
 namespace dom {
 class PaymentRequestUpdateEvent;
-struct PaymentMethodChangeEventInit;
 class PaymentMethodChangeEvent final : public PaymentRequestUpdateEvent
 {
 public:

dom/webidl/PaymentMethodChangeEvent.webidl

@@ -8,6 +8,6 @@ interface PaymentMethodChangeEvent : PaymentRequestUpdateEvent {
 };
 
 dictionary PaymentMethodChangeEventInit : PaymentRequestUpdateEventInit {
-    DOMString methodName = "";
-    object?   methodDetails = null;
+    required DOMString methodName;
+             object?   methodDetails;
 };

testing/web-platform/meta/MANIFEST.json

@@ -625005,11 +625005,11 @@
    "testharness"
   ],
   "payment-request/PaymentMethodChangeEvent/methodDetails-attribute.https.html": [
-   "ec0aa96dddb46b26617064ab54e9d02e2a588cbb",
+   "a478c559d497e8dea9d471ce1e36427bfb741aa7",
    "testharness"
   ],
   "payment-request/PaymentMethodChangeEvent/methodName-attribute.https.html": [
-   "176638c7852f6f0f8fd7a8c3dfefdf439a829d22",
+   "e6e0bf9a91971b3a20acf59cf27097281f0d2085",
    "testharness"
   ],
   "payment-request/PaymentRequestUpdateEvent/constructor.http.html": [
@@ -651101,7 +651101,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/update/update.py": [
-   "240e9279db2fe6a4c444ba80ad9d4704551997fa",
+   "69c3f88ec6851760081474f0f08126f3a1942660",
    "support"
   ],
   "tools/wptrunner/wptrunner/vcs.py": [
@@ -651113,7 +651113,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/wptcommandline.py": [
-   "5ea75483d6c2ac36fccb5e8373f0b962481dbc71",
+   "81561f159a319e4a5cbe9b1d51868909649a1643",
    "support"
   ],
   "tools/wptrunner/wptrunner/wptlogging.py": [
@@ -653933,7 +653933,7 @@
    "support"
   ],
   "web-animations/animation-model/animation-types/property-types.js": [
-   "232a508e07cb3db2eb9d9094a6e9fd8a1e63e4a0",
+   "5bafb20dfcfafb34464fe387457f06c434c7c188",
    "support"
   ],
   "web-animations/animation-model/animation-types/visibility.html": [

testing/web-platform/meta/payment-request/PaymentMethodChangeEvent/__dir__.ini

@@ -1 +0,0 @@
-prefs: [dom.payments.request.enabled:true]

testing/web-platform/meta/payment-request/PaymentMethodChangeEvent/methodDetails-attribute.https.html.ini

@@ -0,0 +1,7 @@
+[methodDetails-attribute.https.html]
+  [Must have a methodDetails IDL attribute, which is initialized with to the methodName dictionary value]
+    expected: FAIL
+
+  [The methodDetails member defaults to null]
+    expected: FAIL
+

testing/web-platform/meta/payment-request/PaymentMethodChangeEvent/methodName-attribute.https.html.ini

@@ -0,0 +1,7 @@
+[methodName-attribute.https.html]
+  [Must have a methodName IDL attribute, which is initialized with to the methodName dictionary value]
+    expected: FAIL
+
+  [When no dictionary is passed, the methodName member defaults to the empty string]
+    expected: FAIL
+

testing/web-platform/tests/payment-request/PaymentMethodChangeEvent/methodDetails-attribute.https.html

@@ -19,15 +19,4 @@ test(() => {
   assert_equals(test, "pass");
   assert_equals(event.methodDetails, methodDetails);
 }, "Must have a methodDetails IDL attribute, which is initialized with to the methodName dictionary value");
-
-test(() => {
-  const event = new PaymentMethodChangeEvent("test");
-  assert_equals(event.methodDetails, null, "methodDetails attribute must initialize to null");
-
-  const event2 = new PaymentMethodChangeEvent("test", { methodName: "basic-card" });
-  assert_equals(event2.methodDetails, null, "methodDetails attribute must initialize to null");
-
-  const event3 = new PaymentMethodChangeEvent("test", {});
-  assert_equals(event2.methodDetails, null, "methodDetails attribute must initialize to null");
-}, "The methodDetails member defaults to null");
 </script>

testing/web-platform/tests/payment-request/PaymentMethodChangeEvent/methodName-attribute.https.html

@@ -14,15 +14,4 @@ test(() => {
   const { methodName } = event;
   assert_equals(methodName, "wpt-test");
 }, "Must have a methodName IDL attribute, which is initialized with to the methodName dictionary value");
-
-test(() => {
-  const event = new PaymentMethodChangeEvent("test");
-  assert_equals(event.methodName, "", "methodName attribute must initialize to empty string");
-
-  const event2 = new PaymentMethodChangeEvent("test", { methodDetails: {} });
-  assert_equals(event2.methodName, "", "methodName attribute must initialize to empty string");
-
-  const event3 = new PaymentMethodChangeEvent("test", {});
-  assert_equals(event3.methodName, "", "methodName attribute must initialize to empty string");
-}, "When no dictionary is passed, the methodName member defaults to the empty string");
 </script>