MAGETWO-56447: UPS not providing shipping rates for Puerto Rico

Author: Dmytro Yushkin

app/code/Magento/Ups/Model/Carrier.php

@@ -325,13 +325,13 @@ public function setRequest(RateRequest $request)
             $destCountry = self::GUAM_COUNTRY_ID;
         }
 
-        $rowRequest->setDestCountry($this->_countryFactory->create()->load($destCountry)->getData('iso2_code'));
+        $country = $this->_countryFactory->create()->load($destCountry);
+        $rowRequest->setDestCountry($country->getData('iso2_code') ?: $destCountry);
 
         $rowRequest->setDestRegionCode($request->getDestRegionCode());
 
         if ($request->getDestPostcode()) {
             $rowRequest->setDestPostal($request->getDestPostcode());
-        } else {
         }
 
         $weight = $this->getTotalNumOfBoxes($request->getPackageWeight());

app/code/Magento/Ups/Test/Unit/Model/CarrierTest.php

@@ -7,6 +7,8 @@
 
 use Magento\Quote\Model\Quote\Address\RateRequest;
 use Magento\Ups\Model\Carrier;
+use Magento\Directory\Model\Country;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -57,7 +59,7 @@ class CarrierTest extends \PHPUnit_Framework_TestCase
     protected $countryFactory;
 
     /**
-     * @var \Magento\Directory\Model\Country
+     * @var Country|MockObject
      */
     protected $country;
 
@@ -309,4 +311,47 @@ public function logDataProvider()
             ]
         ];
     }
+
+    /**
+     * @covers \Magento\Ups\Model\Carrier::setRequest
+     * @param string $countryCode
+     * @param string $foundCountryCode
+     * @dataProvider countryDataProvider
+     */
+    public function testSetRequest($countryCode, $foundCountryCode)
+    {
+        /** @var RateRequest $request */
+        $request = $this->helper->getObject(RateRequest::class);
+        $request->setData([
+            'orig_country' => 'USA',
+            'orig_region_code' => 'CA',
+            'orig_post_code' => 90230,
+            'orig_city' => 'Culver City',
+            'dest_country_id' => $countryCode,
+        ]);
+
+        $this->country->expects(static::at(1))
+            ->method('load')
+            ->with($countryCode)
+            ->willReturnSelf();
+
+        $this->country->expects(static::any())
+            ->method('getData')
+            ->with('iso2_code')
+            ->willReturn($foundCountryCode);
+
+        $this->model->setRequest($request);
+    }
+
+    /**
+     * Get list of country variations
+     * @return array
+     */
+    public function countryDataProvider()
+    {
+        return [
+            ['countryCode' => 'PR', 'foundCountryCode' => null],
+            ['countryCode' => 'US', 'foundCountryCode' => 'US'],
+        ];
+    }
 }