Merge pull request #10180 from rsolomakhin/method

Replace 'enabledMethods' array with 'method' string.
web-platform-tests · Mar 27, 2018 · e96e038 · e96e038
2 parents 6135f17 + c5e2e61
commit e96e038
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/interfaces/payment-handler.idl b/interfaces/payment-handler.idl
@@ -19,7 +19,7 @@ interface PaymentInstruments {
 dictionary PaymentInstrument {
     required DOMString             name;
              sequence<ImageObject> icons;
-             sequence<DOMString>   enabledMethods;
+             DOMString             method;
              object                capabilities;
 };
 dictionary ImageObject {

diff --git a/payment-handler/can-make-payment-event.https.html b/payment-handler/can-make-payment-event.https.html
@@ -24,7 +24,7 @@
   }
   await registration.paymentManager.instruments.set(instrumentKey, {
     name: 'Test Payment Method',
-    enabledMethods: [methodName],
+    method: methodName,
   });
   return registration;
 }
@@ -310,7 +310,7 @@
   const registration = await registerApp(methodName);
   await registration.paymentManager.instruments.set(instrumentKey, {
     name: 'Test Payment Method',
-    enabledMethods: [methodName],
+    method: methodName,
     capabilities: {
       supportedTypes: [cardType],
       supportedNetworks: [cardNetwork],
@@ -360,7 +360,7 @@
   const registration = await registerApp(methodName);
   await registration.paymentManager.instruments.set(instrumentKey, {
     name: 'Test Payment Method',
-    enabledMethods: [methodName],
+    method: methodName,
     capabilities: {
       supportedTypes: [cardType],
       supportedNetworks: [cardNetwork],

diff --git a/payment-handler/payment-instruments.https.html b/payment-handler/payment-instruments.https.html
@@ -76,7 +76,7 @@
             type: 'image/png',
           },
         ],
-        enabledMethods: ['basic-card'],
+        method: 'basic-card',
         capabilities: {supportedNetworks: ['mir'], supportedTypes: ['prepaid']},
       },
     );
@@ -103,7 +103,7 @@
         icons: [
           {src: '/images/green-16x16.png', sizes: '16x16', type: 'image/png'},
         ],
-        enabledMethods: ['basic-card'],
+        method: 'basic-card',
         capabilities: {supportedNetworks: ['mir'], supportedTypes: ['prepaid']},
       },
     );
@@ -118,7 +118,7 @@
     );
     assert_equals(result.icons[0].sizes, '16x16');
     assert_equals(result.icons[0].type, 'image/png');
-    assert_array_equals(result.enabledMethods, ['basic-card']);
+    assert_equals(result.method, 'basic-card');
     assert_array_equals(result.capabilities.supportedNetworks, ['mir']);
     assert_array_equals(result.capabilities.supportedTypes, ['prepaid']);
     await registration.paymentManager.instruments.set(
@@ -132,7 +132,7 @@
             type: 'image/png',
           },
         ],
-        enabledMethods: ['basic-card'],
+        method: 'basic-card',
         capabilities: {supportedNetworks: ['visa'], supportedTypes: ['credit']},
       },
     );
@@ -147,7 +147,7 @@
     );
     assert_equals(result.icons[0].sizes, '256x256');
     assert_equals(result.icons[0].type, 'image/png');
-    assert_array_equals(result.enabledMethods, ['basic-card']);
+    assert_equals(result.method, 'basic-card');
     assert_array_equals(result.capabilities.supportedNetworks, ['visa']);
     assert_array_equals(result.capabilities.supportedTypes, ['credit']);
   }, 'Resetting an existing instrument updates the instrument');
@@ -165,7 +165,7 @@
             type: 'image/png',
           },
         ],
-        enabledMethods: ['basic-card'],
+        method: 'basic-card',
         capabilities: {supportedNetworks: ['mir'], supportedTypes: ['prepaid']},
       },
     );
@@ -189,7 +189,7 @@
             type: 'image/jif',
           },
         ],
-        enabledMethods: ['basic-card'],
+        method: 'basic-card',
       },
     );
     return promise_rejects(t, new TypeError(), setPromise);
@@ -208,7 +208,7 @@
             type: 'image/pn' + 'g'.repeat(1000),
           },
         ],
-        enabledMethods: ['basic-card'],
+        method: 'basic-card',
       },
     );
     return promise_rejects(t, new TypeError(), setPromise);
@@ -225,7 +225,7 @@
           type: 'image/png',
         },
       ],
-      enabledMethods: ['basic-card'],
+      method: 'basic-card',
     });
   }, "Don't crash when registering an instrument with a very long icon size 888...x888...");
 
@@ -242,7 +242,7 @@
             type: 'image/png',
           },
         ],
-        enabledMethods: ['basic-card'],
+        method: 'basic-card',
       },
     );
     return promise_rejects(t, new TypeError(), setPromise);
@@ -261,7 +261,7 @@
             type: 'image/png',
           },
         ],
-        enabledMethods: ['basic-card'],
+        method: 'basic-card',
       },
     );
     return promise_rejects(t, new TypeError(), setPromise);
@@ -280,7 +280,7 @@
             type: 'image/png',
           },
         ],
-        enabledMethods: ['basic-card'],
+        method: 'basic-card',
       },
     );
     return promise_rejects(t, new TypeError(), setPromise);
@@ -300,7 +300,7 @@
             type: 'image/gif',
           },
         ],
-        enabledMethods: ['basic-card'],
+        method: 'basic-card',
       },
     );
     return promise_rejects(t, new TypeError(), setPromise);
@@ -313,7 +313,7 @@
       icons: [
         {src: '/images/rgrg-256x256.png', sizes: '256x256', type: 'image/png'},
       ],
-      enabledMethods: [existingKey],
+      method: existingKey,
       capabilities: {aCapabilityName: existingKey},
     });
     const hasExistingInstrument = await registration.paymentManager.instruments.has(

diff --git a/payment-handler/payment-request-event.https.html b/payment-handler/payment-request-event.https.html
@@ -15,7 +15,7 @@
     icons: [
       {src: '/images/rgrg-256x256.png', sizes: '256x256', type: 'image/png'},
     ],
-    enabledMethods: ['basic-card'],
+    method: 'basic-card',
     capabilities: {supportedNetworks: ['mir'], supportedTypes: ['prepaid']},
   });
   runTests();