AC-2518: salesrule percentage amount bug

- add integration test

Author: xmav

app/code/Magento/SalesRule/Model/Utility.php

@@ -189,8 +189,6 @@ public function deltaRoundingFix(
         $rowTotalInclTax = $item->getRowTotalInclTax();
         $baseRowTotalInclTax = $item->getBaseRowTotalInclTax();
 
-        //TODO Seems \Magento\Quote\Model\Quote\Item\AbstractItem::getDiscountPercent() returns float value
-        //that can not be used as array index
         $percentKey = (string)$item->getDiscountPercent();
         $rowTotal = $item->getRowTotal();
         if ($percentKey && $rowTotal > 0) {

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

@@ -498,31 +498,56 @@ public function multishippingDataProvider(): array
      * @magentoDataFixture Magento/SalesRule/_files/cart_rule_50_percent_off_no_condition.php
      * @magentoDataFixture Magento/SalesRule/_files/cart_fixed_10_discount.php
      * @magentoDataFixture Magento/Checkout/_files/quote_with_simple_products.php
+     * @dataProvider discountByPercentDataProvider
      * @return void
      */
-    public function testDiscountsWhenByPercentRuleAppliedFirstAndCartFixedRuleSecond(): void
-    {
-        $totalDiscount = -20.99;
-        $discounts = [
-            'simple1' => 5.72,
-            'simple2' => 15.27,
-        ];
+    public function testDiscountsWhenByPercentRuleAppliedFirstAndCartFixedRuleSecond(
+        $percentDiscount,
+        $expectedDiscounts
+    ): void {
+        //Update rule discount
+        /** @var \Magento\SalesRule\Model\Rule $rule */
+        $rule = $this->getRule('50% off - July 4');
+        $rule->setDiscountAmount($percentDiscount);
+        $this->saveRule($rule);
         $quote = $this->getQuote('test_quote_with_simple_products');
         $quote->setCouponCode('2?ds5!2d');
         $quote->collectTotals();
         $this->quoteRepository->save($quote);
         $this->assertEquals(21.98, $quote->getBaseSubtotal());
-        $this->assertEquals($totalDiscount, $quote->getShippingAddress()->getDiscountAmount());
+        $this->assertEquals($expectedDiscounts['totalDiscount'], $quote->getShippingAddress()->getDiscountAmount());
         $items = $quote->getAllItems();
         $this->assertCount(2, $items);
         $item = array_shift($items);
         $this->assertEquals('simple1', $item->getSku());
         $this->assertEquals(5.99, $item->getPrice());
-        $this->assertEquals($discounts[$item->getSku()], $item->getDiscountAmount());
+        $this->assertEquals($expectedDiscounts[$item->getSku()], $item->getDiscountAmount());
         $item = array_shift($items);
         $this->assertEquals('simple2', $item->getSku());
         $this->assertEquals(15.99, $item->getPrice());
-        $this->assertEquals($discounts[$item->getSku()], $item->getDiscountAmount());
+        $this->assertEquals($expectedDiscounts[$item->getSku()], $item->getDiscountAmount());
+    }
+
+    public function discountByPercentDataProvider()
+    {
+        return [
+            [
+                'percentDiscount' => 0,
+                'expectedDiscounts' => ['simple1' => 2.73, 'simple2' => 7.27, 'totalDiscount' => -10]
+            ],
+            [
+                'percentDiscount' => 15.5,
+                'expectedDiscounts' => ['simple1' => 3.65, 'simple2' => 9.76, 'totalDiscount' => -13.41]
+            ],
+            [
+                'percentDiscount' => 50,
+                'expectedDiscounts' => ['simple1' => 5.72, 'simple2' => 15.27, 'totalDiscount' => -20.99]
+            ],
+            [
+                'percentDiscount' => 100,
+                'expectedDiscounts' => ['simple1' => 5.99, 'simple2' => 15.99, 'totalDiscount' => -21.98]
+            ],
+        ];
     }
 
     /**