Merge remote-tracking branch 'origin/BUG#AC-2583' into Hammer_Quality_Backlog_GraphQl_13042022

Author: glo71317

app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php

@@ -73,7 +73,7 @@ public function collect(
         $address->setFreeMethodWeight($data['freeMethodWeight']);
 
         $isFreeShipping = $this->freeShipping->isFreeShipping($quote, $shippingAssignment->getItems());
-        $address->setFreeShipping($isFreeShipping);
+        $address->setFreeShipping((int)$isFreeShipping);
         // recalculate weights
         $data = $this->getAssignmentWeightData($address, $shippingAssignment->getItems());
         $address->setItemQty($data['addressQty']);

app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/ShippingTest.php

@@ -209,11 +209,16 @@ public function testCollect(): void
         $this->shippingAssignment->expects($this->atLeastOnce())
             ->method('getItems')
             ->willReturn([$this->cartItem]);
-        $this->freeShipping->method('isFreeShipping')
+        $isFreeShipping = true;
+        $this->freeShipping
+            ->expects($this->once())
+            ->method('isFreeShipping')
             ->with($this->quote, [$this->cartItem])
-            ->willReturn(true);
-        $this->address->method('setFreeShipping')
-            ->with(true);
+            ->willReturn($isFreeShipping);
+        $this->address
+            ->expects($this->once())
+            ->method('setFreeShipping')
+            ->with((int)$isFreeShipping);
         $this->total->expects($this->atLeastOnce())
             ->method('setTotalAmount');
         $this->total->expects($this->atLeastOnce())

dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_free_shipping_by_cart.php

@@ -64,7 +64,7 @@
         'is_rss' => 1,
         'use_auto_generation' => 0,
         'uses_per_coupon' => 0,
-        'simple_free_shipping' => 2,
+        'simple_free_shipping' => 1,
 
         'website_ids' => [
             $objectManager->get(StoreManagerInterface::class)->getWebsite()->getId()