Merge pull request #130 from magento-fearless-kiwis/FearlessKiwis-MAGETWO-MAGETWO-45024-Shipping-Amount-Incorrect-Currency

[FearlessKiwis] Bug fix

Author: Tang, Yu(ytang1)

app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php

@@ -171,7 +171,8 @@ public function collect(
                     $total->setBaseTotalAmount($this->getCode(), $rate->getPrice());
                     $shippingDescription = $rate->getCarrierTitle() . ' - ' . $rate->getMethodTitle();
                     $address->setShippingDescription(trim($shippingDescription, ' -'));
-                    $total->setShippingAmount($rate->getPrice());
+                    $total->setBaseShippingAmount($rate->getPrice());
+                    $total->setShippingAmount($amountPrice);
                     $total->setShippingDescription($address->getShippingDescription());
                     break;
                 }

app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/ShippingTest.php

@@ -70,6 +70,7 @@ protected function setUp()
             'Magento\Quote\Model\Quote\Address\Total',
             [
                 'setShippingAmount',
+                'setBaseShippingAmount',
                 'setBaseTotalAmount',
                 'setTotalAmount',
                 'setShippingDescription',
@@ -229,9 +230,12 @@ public function testCollect()
         $this->priceCurrency->expects($this->once())
             ->method('convert')
             ->with(5, $this->store)
-            ->willReturn(5);
+            ->willReturn(10);
         $this->total->expects($this->once())
             ->method('setShippingAmount')
+            ->with(10);
+        $this->total->expects($this->once())
+            ->method('setBaseShippingAmount')
             ->with(5);
         $this->rate->expects($this->once())
             ->method('getCarrierTitle')