Update to latest

Follows w3c/payment-request#426 w3c/payment-request#453
web-platform-tests · Mar 10, 2017 · 970a58f · 970a58f
1 parent 7665939
commit 970a58f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/payment-request/historical.https.html b/payment-request/historical.https.html
@@ -15,6 +15,10 @@
   // https://github.com/w3c/browser-payment-api/pull/219
   ["totalAmount", "PaymentResponse"],
 
+  // https://github.com/w3c/browser-payment-api/pull/426
+  ["paymentRequestId", "PaymentRequest"],
+  ["paymentRequestId", "PaymentResponse"],
+
 ].forEach(([member, interf]) => {
   test(() => {
     assert_false(member in window[interf].prototype);

diff --git a/payment-request/interfaces.https.html b/payment-request/interfaces.https.html
@@ -12,14 +12,14 @@
 interface EventTarget {};
 </script>
 <script type=text/plain>
-[Constructor(sequence<PaymentMethodData> methodData, PaymentDetails details, optional PaymentOptions options),
+[Constructor(sequence<PaymentMethodData> methodData, PaymentDetailsInit details, optional PaymentOptions options),
  SecureContext]
 interface PaymentRequest : EventTarget {
     Promise<PaymentResponse> show();
     Promise<void>            abort();
     Promise<boolean>         canMakePayment();
 
-    readonly attribute DOMString?           paymentRequestId;
+    readonly attribute DOMString            id;
     readonly attribute PaymentAddress?      shippingAddress;
     readonly attribute DOMString?           shippingOption;
     readonly attribute PaymentShippingType? shippingType;
@@ -37,12 +37,18 @@
     required DOMString value;
              DOMString currencySystem = "urn:iso:std:iso:4217";
 };
-dictionary PaymentDetails {
-    PaymentItem                      total;
+dictionary PaymentDetailsBase {
     sequence<PaymentItem>            displayItems;
     sequence<PaymentShippingOption>  shippingOptions;
     sequence<PaymentDetailsModifier> modifiers;
-    DOMString                        error;
+};
+dictionary PaymentDetailsInit : PaymentDetailsBase {
+             DOMString   id;
+    required PaymentItem total;
+};
+dictionary PaymentDetailsUpdate : PaymentDetailsBase {
+    DOMString   error;
+    PaymentItem total;
 };
 dictionary PaymentDetailsModifier {
     required sequence<DOMString>   supportedMethods;
@@ -91,13 +97,13 @@
 enum PaymentComplete {
     "fail",
     "success",
-    "unknown",
+    "unknown"
 };
 [SecureContext]
 interface PaymentResponse {
     serializer = {attribute};
 
-    readonly attribute DOMString       paymentRequestId;
+    readonly attribute DOMString       requestId;
     readonly attribute DOMString       methodName;
     readonly attribute object          details;
     readonly attribute PaymentAddress? shippingAddress;
@@ -111,7 +117,7 @@
 [Constructor(DOMString type, optional PaymentRequestUpdateEventInit eventInitDict),
  SecureContext]
 interface PaymentRequestUpdateEvent : Event {
-    void updateWith(Promise<PaymentDetails> detailsPromise);
+    void updateWith(Promise<PaymentDetailsUpdate> detailsPromise);
 };
 dictionary PaymentRequestUpdateEventInit : EventInit {
 };