Remove tests for supportedTypes from payment handler (#13860)

web-platform-tests · Nov 1, 2018 · 5d4871b · 5d4871b
1 parent a6322a0
commit 5d4871b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 39 deletions.
diff --git a/payment-handler/basic-card.js b/payment-handler/basic-card.js
@@ -33,29 +33,6 @@ self.addEventListener('paymentrequest', event => {
     return;
   }
 
-  const supportedTypes = methodData.data.supportedTypes;
-  if (!supportedTypes) {
-    const msg = 'Expected supported types in payment method specific data';
-    event.respondWith(Promise.reject(new Error(msg)));
-    return;
-  }
-
-  if (supportedTypes.length !== 1) {
-    const msg = `Expected one supported type, but got ${
-      supportedTypes.length
-    } instead`;
-    event.respondWith(Promise.reject(new Error(msg)));
-    return;
-  }
-
-  const supportedType = supportedTypes[0];
-  const expectedSupportedType = 'prepaid';
-  if (supportedType !== expectedSupportedType) {
-    const msg = `Expected supported type "${expectedSupportedType}", but got "${supportedType}"`;
-    event.respondWith(Promise.reject(new Error(msg)));
-    return;
-  }
-
   if (methodData.displayItems) {
     const msg = 'Expected no display items';
     event.respondWith(Promise.reject(new Error(msg)));

diff --git a/payment-handler/can-make-payment-event.https.html b/payment-handler/can-make-payment-event.https.html
@@ -264,14 +264,12 @@
 promise_test(async t => {
   const methodName = 'basic-card';
   await registerApp(methodName);
-  const cardType = 'prepaid';
   const cardNetwork = 'mir';
   const request = new PaymentRequest(
     [
       {
         supportedMethods: methodName,
         data: {
-          supportedTypes: [cardType],
           supportedNetworks: [cardNetwork],
         },
       },
@@ -305,14 +303,12 @@
 
 promise_test(async t => {
   const methodName = 'basic-card';
-  const cardType = 'prepaid';
   const cardNetwork = 'mir';
   const registration = await registerApp(methodName);
   await registration.paymentManager.instruments.set(instrumentKey, {
     name: 'Test Payment Method',
     method: methodName,
     capabilities: {
-      supportedTypes: [cardType],
       supportedNetworks: [cardNetwork],
     },
   });
@@ -321,7 +317,6 @@
       {
         supportedMethods: methodName,
         data: {
-          supportedTypes: [cardType],
           supportedNetworks: [cardNetwork],
         },
       },
@@ -355,14 +350,12 @@
 
 promise_test(async t => {
   const methodName = 'basic-card';
-  const cardType = 'prepaid';
   const cardNetwork = 'mir';
   const registration = await registerApp(methodName);
   await registration.paymentManager.instruments.set(instrumentKey, {
     name: 'Test Payment Method',
     method: methodName,
     capabilities: {
-      supportedTypes: [cardType],
       supportedNetworks: [cardNetwork],
     },
   });

diff --git a/payment-handler/payment-instruments.https.html b/payment-handler/payment-instruments.https.html
@@ -77,7 +77,7 @@
           },
         ],
         method: 'basic-card',
-        capabilities: {supportedNetworks: ['mir'], supportedTypes: ['prepaid']},
+        capabilities: {supportedNetworks: ['mir']},
       },
     );
     const result = await registration.paymentManager.instruments.get(
@@ -104,7 +104,7 @@
           {src: '/images/green-16x16.png', sizes: '16x16', type: 'image/png'},
         ],
         method: 'basic-card',
-        capabilities: {supportedNetworks: ['mir'], supportedTypes: ['prepaid']},
+        capabilities: {supportedNetworks: ['mir']},
       },
     );
     let result = await registration.paymentManager.instruments.get(
@@ -120,7 +120,6 @@
     assert_equals(result.icons[0].type, 'image/png');
     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(
       'existing-instrument-key',
       {
@@ -133,7 +132,7 @@
           },
         ],
         method: 'basic-card',
-        capabilities: {supportedNetworks: ['visa'], supportedTypes: ['credit']},
+        capabilities: {supportedNetworks: ['visa']},
       },
     );
     result = await registration.paymentManager.instruments.get(
@@ -149,7 +148,6 @@
     assert_equals(result.icons[0].type, 'image/png');
     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');
 
   promise_test(async t => {
@@ -166,7 +164,7 @@
           },
         ],
         method: 'basic-card',
-        capabilities: {supportedNetworks: ['mir'], supportedTypes: ['prepaid']},
+        capabilities: {supportedNetworks: ['mir']},
       },
     );
     await registration.paymentManager.instruments.clear();

diff --git a/payment-handler/payment-request-event.https.html b/payment-handler/payment-request-event.https.html
@@ -16,7 +16,7 @@
       {src: '/images/rgrg-256x256.png', sizes: '256x256', type: 'image/png'},
     ],
     method: 'basic-card',
-    capabilities: {supportedNetworks: ['mir'], supportedTypes: ['prepaid']},
+    capabilities: {supportedNetworks: ['mir']},
   });
   runTests();
 }
@@ -25,7 +25,7 @@
   promise_test(async t => {
     const response = await new PaymentRequest(
       [
-        {supportedMethods: 'basic-card', data: {supportedTypes: ['prepaid']}},
+        {supportedMethods: 'basic-card', data: {}},
         {supportedMethods: 'interledger', data: {supportedNetworks: ['mir']}},
       ],
       {
@@ -60,7 +60,7 @@
           },
           {
             supportedMethods: 'interledger',
-            data: {supportedTypes: ['prepaid']},
+            data: {},
             total: {
               label: 'Prepaid total',
               amount: {currency: 'USD', value: '0.0097'},