magento/graphql-ce#757 Remove PaymentMethodAdditionalDataInput From Schema

lenaorobei · lenaorobei · commit c1979da7c03d · 2019-07-19T10:10:59.000-05:00
- fix integration tests
diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Customer/PlaceOrderWithAuthorizeNetTest.php b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Customer/PlaceOrderWithAuthorizeNetTest.php
@@ -94,11 +94,10 @@ public function testDispatchToPlaceOrderWithRegisteredCustomer(): void
       cart_id: "$cartId"
       payment_method: {
           code: "$paymentMethod"
-          additional_data:
-         {authorizenet_acceptjs: 
+          authorizenet_acceptjs: 
             {opaque_data_descriptor: "mydescriptor",
              opaque_data_value: "myvalue",
-             cc_last_4: 1111}}
+             cc_last_4: 1111}
       }
   }) {    
        cart {
diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Customer/SetAuthorizeNetPaymentMethodOnCartTest.php b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Customer/SetAuthorizeNetPaymentMethodOnCartTest.php
@@ -69,11 +69,10 @@ public function testDispatchToSetPaymentMethodWithAuthorizenet(): void
       cart_id: "$maskedQuoteId"
       payment_method: {
           code: "$methodCode"
-          additional_data:
-         {authorizenet_acceptjs: 
+          authorizenet_acceptjs: 
             {opaque_data_descriptor: "COMMON.ACCEPT.INAPP.PAYMENT",
              opaque_data_value: "abx",
-             cc_last_4: 1111}}
+             cc_last_4: 1111}
       }
   }) {    
     cart {
diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Guest/PlaceOrderWithAuthorizeNetTest.php b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Guest/PlaceOrderWithAuthorizeNetTest.php
@@ -94,11 +94,10 @@ public function testDispatchToPlaceAnOrderWithAuthorizenet(): void
       cart_id: "$cartId"
       payment_method: {
           code: "$paymentMethod"
-          additional_data:
-         {authorizenet_acceptjs: 
+          authorizenet_acceptjs: 
             {opaque_data_descriptor: "mydescriptor",
              opaque_data_value: "myvalue",
-             cc_last_4: 1111}}
+             cc_last_4: 1111}
       }
   }) {    
        cart {
diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Guest/SetAuthorizeNetPaymentMethodOnCartTest.php b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Guest/SetAuthorizeNetPaymentMethodOnCartTest.php
@@ -64,11 +64,10 @@ public function testDispatchToSetPaymentMethodWithAuthorizenet(): void
       cart_id: "$maskedQuoteId"
       payment_method: {
           code: "$methodCode"
-          additional_data:
-         {authorizenet_acceptjs: 
+          authorizenet_acceptjs: 
             {opaque_data_descriptor: "COMMON.ACCEPT.INAPP.PAYMENT",
              opaque_data_value: "abx",
-             cc_last_4: 1111}}
+             cc_last_4: 1111}
       }
   }) {    
     cart {
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PaypalExpressSetPaymentMethodTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PaypalExpressSetPaymentMethodTest.php
@@ -98,7 +98,6 @@ public function testResolve(string $paymentMethod): void
     setPaymentMethodOnCart(input: {
         payment_method: {
           code: "{$paymentMethod}",
-          additional_data: {
             paypal_express: {
               payer_id: "$payerId",
               token: "$token"
@@ -107,7 +106,6 @@ public function testResolve(string $paymentMethod): void
               payer_id: "$payerId",
               token: "$token"
             }
-          }
         },
         cart_id: "{$maskedCartId}"})
       {
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowLinkTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowLinkTest.php
@@ -124,13 +124,11 @@ public function testResolvePlaceOrderWithPayflowLinkForCustomer(): void
       cart_id: "$cartId"
       payment_method: {
           code: "$paymentMethod"
-          additional_data: {
             payflow_link: 
             {
            cancel_url:"{$baseUrl}paypal/payflow/cancelPayment"
            return_url:"{$baseUrl}paypal/payflow/returnUrl"
           }
-        }
       }
   }) {    
        cart {
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowProTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowProTest.php
@@ -80,15 +80,13 @@ public function testResolveCustomer(): void
     setPaymentMethodOnCart(input: {
         payment_method: {
           code: "{$paymentMethod}",
-          additional_data: {
             payflowpro: {
               cc_details: {
                  cc_exp_month: 12,
                  cc_exp_year: 2030,
                  cc_last_4: 1111,
                  cc_type: "IV",
               }
-            }
           }
         },
         cart_id: "{$cartId}"})
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalExpressSetPaymentMethodTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalExpressSetPaymentMethodTest.php
@@ -96,7 +96,6 @@ public function testResolveGuest(string $paymentMethod): void
     setPaymentMethodOnCart(input: {
         payment_method: {
           code: "{$paymentMethod}",
-          additional_data: {
             paypal_express: {
               payer_id: "$payerId",
               token: "$token"
@@ -105,7 +104,6 @@ public function testResolveGuest(string $paymentMethod): void
               payer_id: "$payerId",
               token: "$token"
             }
-          }
         },
         cart_id: "{$cartId}"})
       {
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalPayflowProSetPaymentMethodTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalPayflowProSetPaymentMethodTest.php
@@ -80,15 +80,13 @@ public function testResolveGuest(): void
     setPaymentMethodOnCart(input: {
         payment_method: {
           code: "{$paymentMethod}",
-          additional_data: {
             payflowpro: {
               cc_details: {
                  cc_exp_month: 12,
                  cc_exp_year: 2030,
                  cc_last_4: 1111,
                  cc_type: "IV",
               }
-            }
           }
         },
         cart_id: "{$cartId}"})
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPayflowLinkTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPayflowLinkTest.php
@@ -117,14 +117,12 @@ public function testResolvePlaceOrderWithPayflowLink(): void
       cart_id: "$cartId"
       payment_method: {
           code: "$paymentMethod"
-          additional_data: {
             payflow_link: 
             {
            cancel_url:"http://mage.test/paypal/payflow/cancel"
            return_url:"http://mage.test/paypal/payflow/return"
            error_url:"http://mage.test/paypal/payflow/error"
           }
-        }
       }
   }) {    
        cart {
@@ -221,14 +219,12 @@ public function testResolveWithPayflowLinkDeclined(): void
       cart_id: "$cartId"
       payment_method: {
           code: "$paymentMethod"
-          additional_data: {
             payflow_link: 
             {
            cancel_url:"http://mage.test/paypal/payflow/cancelPayment"
            return_url:"http://mage.test/paypal/payflow/returnUrl"
            error_url:"http://mage.test/paypal/payflow/returnUrl"
           }
-        }
       }
   }) {    
        cart {
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/SetPaymentMethodAsPayflowLinkTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/SetPaymentMethodAsPayflowLinkTest.php
@@ -71,13 +71,11 @@ public function testSetPayflowLinkAsPaymentMethod(): void
       cart_id: "$maskedCartId"
       payment_method: {
           code: "$paymentMethod"
-          additional_data: {
             payflow_link: {           
                return_url:"http://magento.com/paypal/payflow/link/success"
                cancel_url:"http://magento.com/paypal/payflow/link/cancel"
                error_url:"http://magento.com/paypal/payflow/link/error"
             }
-          }
       }
   }) {    
        cart {
@@ -147,13 +145,11 @@ public function testInvalidUrl(): void
       cart_id: "$cartId"
       payment_method: {
           code: "$paymentMethod"
-          additional_data: {
             payflow_link: {           
                return_url:"http://magento.com/paypal/payflow/link/sucess"
                cancel_url:"http://magento.com/paypal/payflow/link/cancel"
                error_url:"/not/a/validUrl"
             }
-        }
       }
   }) {    
        cart {

Original file line number	Diff line number	Diff line change
`@@ -124,13 +124,11 @@ public function testResolvePlaceOrderWithPayflowLinkForCustomer(): void`
`124`	`124`	`cart_id: "$cartId"`
`125`	`125`	`payment_method: {`
`126`	`126`	`code: "$paymentMethod"`
`127`		`- additional_data: {`
`128`	`127`	`payflow_link:`
`129`	`128`	`{`
`130`	`129`	`cancel_url:"{$baseUrl}paypal/payflow/cancelPayment"`
`131`	`130`	`return_url:"{$baseUrl}paypal/payflow/returnUrl"`
`132`	`131`	`}`
`133`		`- }`
`134`	`132`	`}`
`135`	`133`	`}) {`
`136`	`134`	`cart {`
Original file line number	Diff line number	Diff line change
`@@ -117,14 +117,12 @@ public function testResolvePlaceOrderWithPayflowLink(): void`
`117`	`117`	`cart_id: "$cartId"`
`118`	`118`	`payment_method: {`
`119`	`119`	`code: "$paymentMethod"`
`120`		`- additional_data: {`
`121`	`120`	`payflow_link:`
`122`	`121`	`{`
`123`	`122`	`cancel_url:"http://mage.test/paypal/payflow/cancel"`
`124`	`123`	`return_url:"http://mage.test/paypal/payflow/return"`
`125`	`124`	`error_url:"http://mage.test/paypal/payflow/error"`
`126`	`125`	`}`
`127`		`- }`
`128`	`126`	`}`
`129`	`127`	`}) {`
`130`	`128`	`cart {`
`@@ -221,14 +219,12 @@ public function testResolveWithPayflowLinkDeclined(): void`
`221`	`219`	`cart_id: "$cartId"`
`222`	`220`	`payment_method: {`
`223`	`221`	`code: "$paymentMethod"`
`224`		`- additional_data: {`
`225`	`222`	`payflow_link:`
`226`	`223`	`{`
`227`	`224`	`cancel_url:"http://mage.test/paypal/payflow/cancelPayment"`
`228`	`225`	`return_url:"http://mage.test/paypal/payflow/returnUrl"`
`229`	`226`	`error_url:"http://mage.test/paypal/payflow/returnUrl"`
`230`	`227`	`}`
`231`		`- }`
`232`	`228`	`}`
`233`	`229`	`}) {`
`234`	`230`	`cart {`