Merge remote-tracking branch 'origin/FearlessKiwis-MAGETWO-44708-Shipping-Address-is-not-passed-to-Braintree-if-Shipping-Address' into FearlessKiwis-develop-no-refactoring

Author: Yu Tang

app/code/Magento/Braintree/Model/PaymentMethod.php

@@ -409,6 +409,8 @@ protected function populateAuthorizeRequest(InfoInterface $payment, $token)
         if ($token) {
             $transactionParams['paymentMethodToken'] = $token;
             $transactionParams['customerId'] = $customerId;
+            $transactionParams['billing']  = $this->toBraintreeAddress($billing);
+            $transactionParams['shipping'] = $this->toBraintreeAddress($shipping);
         } elseif ($this->getInfoInstance()->getAdditionalInformation('payment_method_nonce')) {
             $transactionParams['paymentMethodNonce'] =
                 $this->getInfoInstance()->getAdditionalInformation('payment_method_nonce');

app/code/Magento/Braintree/Test/Unit/Model/PaymentMethodTest.php

@@ -1361,8 +1361,6 @@ public function authorizeDataProvider()
                     'merchantAccountId' => self::MERCHANT_ACCOUNT_ID,
                     'paymentMethodToken' => self::CC_TOKEN,
                     'customerId' => self::CUSTOMER_ID,
-                    'billing' => null,
-                    'shipping' => null,
                     'deviceData' => 'fraud_detection_data',
                 ],
                 'braintree_response' => [
@@ -1429,8 +1427,6 @@ public function authorizeDataProvider()
                     'merchantAccountId' => self::MERCHANT_ACCOUNT_ID,
                     'paymentMethodNonce' => self::PAYMENT_METHOD_NONCE,
                     'customerId' => self::CUSTOMER_ID,
-                    'billing' => null,
-                    'shipping' => null,
                     'deviceData' => 'fraud_detection_data',
                     'options' => [
                         'three_d_secure' => [
@@ -1502,8 +1498,6 @@ public function authorizeDataProvider()
                     'merchantAccountId' => self::MERCHANT_ACCOUNT_ID,
                     'paymentMethodToken' => self::CC_TOKEN,
                     'customerId' => self::CUSTOMER_ID,
-                    'billing' => null,
-                    'shipping' => null,
                     'deviceData' => 'fraud_detection_data',
                 ],
                 'braintree_response' => [