MAGETWO-91512: Free Shipping Cart Price Rule not working when UPS shipping method is enabled

Author: dhorytskyi

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

@@ -67,7 +67,7 @@ public function testGetShipConfirmUrlLive()
      * @magentoConfigFixture current_store carriers/ups/allowed_methods 1DA,GND
      * @magentoConfigFixture current_store carriers/ups/free_method GND
      */
-    public function testCollectRates()
+    public function testCollectFreeRates()
     {
         $rateRequest = Bootstrap::getObjectManager()->get(RateRequestFactory::class)->create();
         $rateRequest->setDestCountryId('US');
@@ -77,7 +77,7 @@ public function testCollectRates()
         $rateRequest->setPackageWeight(1);
         $rateRequest->setFreeMethodWeight(0);
         $rateRequest->setLimitCarrier($this->carrier::CODE);
-
+        $rateRequest->setFreeShipping(true);
         $rateResult = $this->carrier->collectRates($rateRequest);
         $result = $rateResult->asArray();
         $methods = $result[$this->carrier::CODE]['methods'];