MC-19080: Incorrect behavior after shipping methods disabled

Author: viktorpetryk

dev/tests/integration/testsuite/Magento/OfflineShipping/Model/CollectRatesTest.php

@@ -11,7 +11,7 @@
  * Integration tests for offline shipping carriers.
  * @magentoAppIsolation enabled
  */
-class CollectRatesTest extends \Magento\Shipping\Model\CollectRatesTest
+class CollectRatesTest extends \Magento\Shipping\Model\CollectRatesAbstract
 {
     /**
      * @var string

dev/tests/integration/testsuite/Magento/Shipping/Model/CollectRatesTest.php renamed to dev/tests/integration/testsuite/Magento/Shipping/Model/CollectRatesAbstract.php

@@ -15,11 +15,10 @@
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
- * Integration tests for shipping carriers.
+ * Abstract class for testing shipping carriers.
  */
-class CollectRatesTest extends \PHPUnit\Framework\TestCase
+abstract class CollectRatesAbstract extends \PHPUnit\Framework\TestCase
 {
-
     /**
      * @var ObjectManagerInterface
      */
@@ -45,14 +44,13 @@ class CollectRatesTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
-        if (empty($this->carrier) || empty($this->errorMessage)) {
-            $this->markTestSkipped('Required fields are empty');
-        }
         $this->objectManager = Bootstrap::getObjectManager();
         $this->shipping = $this->objectManager->get(Shipping::class);
     }
 
     /**
+     * Tests that an error message is displayed when the shipping method is enabled and not applicable.
+     *
      * @return void
      */
     public function testCollectRatesWhenShippingCarrierIsAvailableAndNotApplicable()
@@ -65,6 +63,8 @@ public function testCollectRatesWhenShippingCarrierIsAvailableAndNotApplicable()
     }
 
     /**
+     * Tests that shipping rates don't return when the shipping method is disabled and not applicable.
+     *
      * @return void
      */
     public function testCollectRatesWhenShippingCarrierIsNotAvailableAndNotApplicable()
@@ -76,6 +76,8 @@ public function testCollectRatesWhenShippingCarrierIsNotAvailableAndNotApplicabl
     }
 
     /**
+     * Returns customer address.
+     *
      * @return DataObject
      */
     private function getAddress(): DataObject
@@ -102,6 +104,8 @@ private function getAddress(): DataObject
     }
 
     /**
+     * Returns shipping rate by the result.
+     *
      * @param Result $result
      * @return Method|Error
      */

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

@@ -11,7 +11,7 @@
  * Integration tests for online shipping carriers.
  * @magentoAppIsolation enabled
  */
-class CollectRatesTest extends \Magento\Shipping\Model\CollectRatesTest
+class CollectRatesTest extends \Magento\Shipping\Model\CollectRatesAbstract
 {
     /**
      * @var string