Merge branch 'MAGETWO-55612' into 2.1-develop-pr1

Author: lestare

app/code/Magento/Payment/Model/Checks/CanUseForCountry/CountryProvider.php

@@ -33,9 +33,14 @@ public function __construct(DirectoryHelper $directoryHelper)
      */
     public function getCountry(Quote $quote)
     {
-        /** @var Address $address */
-        $address = $quote->getBillingAddress() ?: $quote->getShippingAddress();
+        /** @var string $country */
+        $country = $quote->getBillingAddress()->getCountry() ? :
+            $quote->getShippingAddress()->getCountry();
 
-        return $address->getCountry() ? : $this->directoryHelper->getDefaultCountry();
+        if (!$country) {
+            $country = $this->directoryHelper->getDefaultCountry();
+        }
+
+        return $country;
     }
 }

app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseForCountry/CountryProviderTest.php

@@ -77,20 +77,31 @@ public function testGetCountry()
      */
     public function testGetCountryForBillingAddressWithoutCountry()
     {
-        $address = $this->getMockBuilder(Address::class)
+        $billingAddress = $this->getMockBuilder(Address::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCountry'])
+            ->getMock();
+
+        $shippingAddress = $this->getMockBuilder(Address::class)
             ->disableOriginalConstructor()
             ->setMethods(['getCountry'])
             ->getMock();
 
-        $this->quote->expects(static::never())
-            ->method('getShippingAddress');
+        $this->quote->expects(static::once())
+            ->method('getShippingAddress')
+            ->willReturn($shippingAddress);
         $this->quote->expects(static::once())
             ->method('getBillingAddress')
-            ->willReturn($address);
+            ->willReturn($billingAddress);
 
-        $address->expects(static::once())
+        $billingAddress->expects(static::once())
+            ->method('getCountry')
+            ->willReturn(null);
+
+        $shippingAddress->expects(static::once())
             ->method('getCountry')
             ->willReturn(null);
+
         $this->directory->expects(static::once())
             ->method('getDefaultCountry')
             ->willReturn('US');
@@ -102,23 +113,32 @@ public function testGetCountryForBillingAddressWithoutCountry()
      */
     public function testGetCountryShippingAddress()
     {
-        $address = $this->getMockBuilder(Address::class)
+        $shippingAddress = $this->getMockBuilder(Address::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCountry'])
+            ->getMock();
+
+        $billingAddress = $this->getMockBuilder(Address::class)
             ->disableOriginalConstructor()
             ->setMethods(['getCountry'])
             ->getMock();
 
         $this->quote->expects(static::once())
             ->method('getBillingAddress')
-            ->willReturn(null);
+            ->willReturn($billingAddress);
 
         $this->quote->expects(static::once())
             ->method('getShippingAddress')
-            ->willReturn($address);
+            ->willReturn($shippingAddress);
 
-        $address->expects(static::once())
+        $shippingAddress->expects(static::once())
             ->method('getCountry')
             ->willReturn('CA');
 
+        $shippingAddress->expects(static::once())
+            ->method('getCountry')
+            ->willReturn(null);
+
         $this->directory->expects(static::never())
             ->method('getDefaultCountry');