MC-19260: Coupon code removed during tax/shipping calculation on checkout

Author: serhii-balko

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

@@ -11,11 +11,14 @@
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ProductRepository;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Api\Data\CartItemInterface;
 use Magento\Quote\Api\GuestCartItemRepositoryInterface;
 use Magento\Quote\Api\GuestCartManagementInterface;
 use Magento\Quote\Api\GuestCartTotalRepositoryInterface;
 use Magento\Quote\Api\GuestCouponManagementInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteIdMask;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -47,15 +50,28 @@ class CartFixedTest extends \PHPUnit\Framework\TestCase
      */
     private $objectManager;
 
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $criteriaBuilder;
+
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $quoteRepository;
+
     /**
      * @inheritdoc
      */
     protected function setUp()
     {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->cartManagement = Bootstrap::getObjectManager()->create(GuestCartManagementInterface::class);
-        $this->couponManagement = Bootstrap::getObjectManager()->create(GuestCouponManagementInterface::class);
-        $this->cartItemRepository = Bootstrap::getObjectManager()->create(GuestCartItemRepositoryInterface::class);
+        $objectManager = Bootstrap::getObjectManager();
+        $this->cartManagement = $objectManager->create(GuestCartManagementInterface::class);
+        $this->couponManagement = $objectManager->create(GuestCouponManagementInterface::class);
+        $this->cartItemRepository = $objectManager->create(GuestCartItemRepositoryInterface::class);
+        $this->criteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+        $this->quoteRepository = $objectManager->get(CartRepositoryInterface::class);
+        $this->objectManager = $objectManager;
     }
 
     /**
@@ -64,6 +80,7 @@ protected function setUp()
      * @param array $productPrices
      * @return void
      * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/SalesRule/_files/coupon_cart_fixed_discount.php
      * @dataProvider applyFixedDiscountDataProvider
      */
@@ -96,25 +113,51 @@ public function testApplyFixedDiscount(array $productPrices): void
     /**
      * Applies fixed discount amount on whole cart and created order with it
      *
-     * @return void
-     * @magentoDataFixture Magento/SalesRule/_files/coupon_cart_fixed_discount_subtotal_with_discount.php
-     * @magentoDataFixture Magento/SalesRule/_files/quote_with_coupon.php
-     *
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default_store carriers/freeshipping/active 1
+     * @magentoDataFixture Magento/Sales/_files/quote.php
+     * @magentoDataFixture Magento/SalesRule/_files/coupon_cart_fixed_subtotal_with_discount.php
      */
     public function testOrderWithFixedDiscount(): void
     {
-        /** @var $quote \Magento\Quote\Model\Quote */
-        $quote = $this->objectManager->create(\Magento\Quote\Model\Quote::class);
+        $expectedGrandTotal = 5;
+
+        $quote = $this->getQuote();
+        $quote->getShippingAddress()
+            ->setShippingMethod('freeshipping_freeshipping')
+            ->setCollectShippingRates(true);
+        $quote->setCouponCode('CART_FIXED_DISCOUNT_15');
+        $quote->collectTotals();
+        $this->quoteRepository->save($quote);
+
+        $this->assertEquals($expectedGrandTotal, $quote->getGrandTotal());
+
         /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
-        $quoteIdMask = $this->objectManager->create(\Magento\Quote\Model\QuoteIdMask::class);
-        $quote->load('test01', 'reserved_order_id');
+        $quoteIdMask = $this->objectManager->create(QuoteIdMask::class);
         $quoteIdMask->load($quote->getId(), 'quote_id');
         Bootstrap::getInstance()->reinitialize();
-
         $cartManagement = Bootstrap::getObjectManager()->create(GuestCartManagementInterface::class);
         $cartManagement->placeOrder($quoteIdMask->getMaskedId());
         $order = $this->getOrder('test01');
-        $this->assertEquals($quote->getGrandTotal(), $order->getGrandTotal());
+        $this->assertEquals($expectedGrandTotal, $order->getGrandTotal());
+    }
+
+    /**
+     * Load cart from fixture.
+     *
+     * @return Quote
+     */
+    private function getQuote(): Quote
+    {
+        $searchCriteria = $this->criteriaBuilder->addFilter('reserved_order_id', 'test01')->create();
+        $carts = $this->quoteRepository->getList($searchCriteria)
+            ->getItems();
+        if (!$carts) {
+            throw new \RuntimeException('Cart from fixture not found');
+        }
+
+        return array_shift($carts);
     }
 
     /**

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

@@ -5,13 +5,32 @@
  */
 declare(strict_types=1);
 
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Registry;
+use Magento\SalesRule\Api\RuleRepositoryInterface;
+use Magento\SalesRule\Model\Rule;
 use Magento\TestFramework\Helper\Bootstrap;
 
-/** @var Magento\Framework\Registry $registry */
-$registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+$objectManager = Bootstrap::getObjectManager();
 
-/** @var Magento\SalesRule\Model\Rule $rule */
-$rule = $registry->registry('cart_rule_fixed_discount_coupon');
-if ($rule) {
-    $rule->delete();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+$searchCriteria = $searchCriteriaBuilder->addFilter('name', '15$ fixed discount on whole cart')
+    ->create();
+/** @var RuleRepositoryInterface $ruleRepository */
+$ruleRepository = $objectManager->get(RuleRepositoryInterface::class);
+$items = $ruleRepository->getList($searchCriteria)
+    ->getItems();
+/** @var Rule $salesRule */
+$salesRule = array_pop($items);
+if ($salesRule !== null) {
+    $ruleRepository->deleteById($salesRule->getRuleId());
 }
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

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

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+include __DIR__ . '/coupon_cart_fixed_discount.php';
+
+use Magento\SalesRule\Model\ResourceModel\Rule as ResourceModel;
+use Magento\SalesRule\Model\Rule\Condition\Address;
+use Magento\SalesRule\Model\Rule\Condition\Combine;
+
+$salesRule->getConditions()->loadArray([
+    'type' => Combine::class,
+    'attribute' => null,
+    'operator' => null,
+    'value' => '1',
+    'is_value_processed' => null,
+    'aggregator' => 'any',
+    'conditions' =>
+        [
+            [
+                'type' => Address::class,
+                'attribute' => 'base_subtotal_with_discount',
+                'operator' => '>=',
+                'value' => 9,
+                'is_value_processed' => false
+            ],
+        ],
+]);
+$salesRule->setDiscountAmount(5);
+$objectManager->get(ResourceModel::class)->save($salesRule);

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

@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+include __DIR__ . '/coupon_cart_fixed_discount_rollback.php';