Merge remote-tracking branch 'github-magento2ce/MAGETWO-98947' into EPAM-PR-52

Author: nikshostko

dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php

@@ -8,6 +8,9 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Quote\Model\Quote\Address\RateRequestFactory;
 
+/**
+ * Integration tests for Carrier model class
+ */
 class CarrierTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -64,12 +67,12 @@ public function testGetShipConfirmUrlLive()
 
     /**
      * @magentoConfigFixture current_store carriers/ups/active 1
+     * @magentoConfigFixture current_store carriers/ups/type UPS
      * @magentoConfigFixture current_store carriers/ups/allowed_methods 1DA,GND
      * @magentoConfigFixture current_store carriers/ups/free_method GND
      */
     public function testCollectFreeRates()
     {
-        $this->markTestSkipped('Test is blocked by MAGETWO-97467.');
         $rateRequest = Bootstrap::getObjectManager()->get(RateRequestFactory::class)->create();
         $rateRequest->setDestCountryId('US');
         $rateRequest->setDestRegionId('CA');