ACP2E-2646: [Cloud] Sales Rule not applied to first order of Multi Shipping

Author: dhorytskyi

app/code/Magento/SalesRule/Test/Unit/Model/Quote/DiscountTest.php

@@ -131,7 +131,7 @@ function ($argument) {
         $this->addressMock = $this->getMockBuilder(Address::class)
             ->addMethods(['getShippingAmount'])
             ->onlyMethods(
-                ['getQuote', 'getAllItems', 'getExtensionAttributes', 'getCustomAttributesCodes', 'setBaseDiscountAmount']
+                ['getQuote','getAllItems','getExtensionAttributes','getCustomAttributesCodes','setBaseDiscountAmount']
             )
             ->disableOriginalConstructor()
             ->getMock();

dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/CartFixedTest.php

@@ -362,11 +362,7 @@ public function testMultishipping(
         $orderSender = $this->getMockBuilder(OrderSender::class)
             ->disableOriginalConstructor()
             ->getMock();
-
-        $model = $this->objectManager->create(
-            Multishipping::class,
-            ['orderSender' => $orderSender]
-        );
+        $model = $this->objectManager->create(Multishipping::class, ['orderSender' => $orderSender]);
         $model->createOrders();
         $orderList = $this->getOrderList((int)$quote->getId());
         $this->assertCount(3, $orderList);
@@ -377,86 +373,41 @@ public function testMultishipping(
          */
         $firstOrder = array_shift($orderList);
         $this->assertNotEmpty($firstOrder->getAppliedRuleIds());
-        $this->assertEquals(
-            $firstOrderTotals['subtotal'],
-            $firstOrder->getSubtotal()
-        );
-        $this->assertEquals(
-            $firstOrderTotals['discount_amount'],
-            $firstOrder->getDiscountAmount()
-        );
-        $this->assertEquals(
-            $firstOrderTotals['shipping_amount'],
-            $firstOrder->getShippingAmount()
-        );
-        $this->assertEquals(
-            $firstOrderTotals['grand_total'],
-            $firstOrder->getGrandTotal()
-        );
+        $this->assertEquals($firstOrderTotals['subtotal'], $firstOrder->getSubtotal());
+        $this->assertEquals($firstOrderTotals['discount_amount'], $firstOrder->getDiscountAmount());
+        $this->assertEquals($firstOrderTotals['shipping_amount'], $firstOrder->getShippingAmount());
+        $this->assertEquals($firstOrderTotals['grand_total'], $firstOrder->getGrandTotal());
         $firstOrderItem = array_values($firstOrder->getItems())[0];
         $this->assertNotEmpty($firstOrderItem->getAppliedRuleIds());
-        $this->assertEquals(
-            $firstOrderTotals['discount_amount'] * -1,
-            $firstOrderItem->getDiscountAmount()
-        );
+        $this->assertEquals($firstOrderTotals['discount_amount'] * -1, $firstOrderItem->getDiscountAmount());
 
         /**
          * The order with $20 simple product
          * @var Order $secondOrder
          */
         $secondOrder = array_shift($orderList);
         $this->assertNotEmpty($secondOrder->getAppliedRuleIds());
-        $this->assertEquals(
-            $secondOrderTotals['subtotal'],
-            $secondOrder->getSubtotal()
-        );
-        $this->assertEquals(
-            $secondOrderTotals['discount_amount'],
-            $secondOrder->getDiscountAmount()
-        );
-        $this->assertEquals(
-            $secondOrderTotals['shipping_amount'],
-            $secondOrder->getShippingAmount()
-        );
-        $this->assertEquals(
-            $secondOrderTotals['grand_total'],
-            $secondOrder->getGrandTotal()
-        );
+        $this->assertEquals($secondOrderTotals['subtotal'], $secondOrder->getSubtotal());
+        $this->assertEquals($secondOrderTotals['discount_amount'], $secondOrder->getDiscountAmount());
+        $this->assertEquals($secondOrderTotals['shipping_amount'], $secondOrder->getShippingAmount());
+        $this->assertEquals($secondOrderTotals['grand_total'], $secondOrder->getGrandTotal());
         $secondOrderItem = array_values($secondOrder->getItems())[0];
         $this->assertNotEmpty($secondOrderItem->getAppliedRuleIds());
-        $this->assertEquals(
-            $secondOrderTotals['discount_amount'] * -1,
-            $secondOrderItem->getDiscountAmount()
-        );
+        $this->assertEquals($secondOrderTotals['discount_amount'] * -1, $secondOrderItem->getDiscountAmount());
 
         /**
          * The order with $5 virtual product and billing address as shipping
          * @var Order $thirdOrder
          */
         $thirdOrder = array_shift($orderList);
         $this->assertNotEmpty($thirdOrder->getAppliedRuleIds());
-        $this->assertEquals(
-            $thirdOrderTotals['subtotal'],
-            $thirdOrder->getSubtotal()
-        );
-        $this->assertEquals(
-            $thirdOrderTotals['discount_amount'],
-            $thirdOrder->getDiscountAmount()
-        );
-        $this->assertEquals(
-            $thirdOrderTotals['shipping_amount'],
-            $thirdOrder->getShippingAmount()
-        );
-        $this->assertEquals(
-            $thirdOrderTotals['grand_total'],
-            $thirdOrder->getGrandTotal()
-        );
+        $this->assertEquals($thirdOrderTotals['subtotal'], $thirdOrder->getSubtotal());
+        $this->assertEquals($thirdOrderTotals['discount_amount'], $thirdOrder->getDiscountAmount());
+        $this->assertEquals($thirdOrderTotals['shipping_amount'], $thirdOrder->getShippingAmount());
+        $this->assertEquals($thirdOrderTotals['grand_total'], $thirdOrder->getGrandTotal());
         $thirdOrderItem = array_values($thirdOrder->getItems())[0];
         $this->assertNotEmpty($thirdOrderItem->getAppliedRuleIds());
-        $this->assertEquals(
-            $thirdOrderTotals['discount_amount'] * -1,
-            $thirdOrderItem->getDiscountAmount()
-        );
+        $this->assertEquals($thirdOrderTotals['discount_amount'] * -1, $thirdOrderItem->getDiscountAmount());
     }
 
     /**