Merge branch 'ACP2E-1818' of https://github.com/magento-l3/magento2ce into PR-04202023

Author: chittima

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

@@ -6,6 +6,8 @@
 
 declare(strict_types=1);
 
+use Magento\Framework\Api\Search\FilterGroup;
+use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Registry;
 use Magento\SalesRule\Api\RuleRepositoryInterface;
@@ -19,11 +21,17 @@
 /** @var RuleRepositoryInterface $ruleRepository */
 $ruleRepository = $bootstrap->get(RuleRepositoryInterface::class);
 
-$ruleId = $registry->registry('Magento/SalesRule/_files/cart_rule_40_percent_off');
-if ($ruleId) {
+$salesRuleName = '40% Off on Large Orders';
+$filterGroup = $bootstrap->get(FilterGroup::class);
+$filterGroup->setData('name', $salesRuleName);
+$searchCriteria = $bootstrap->create(SearchCriteriaInterface::class);
+$searchCriteria->setFilterGroups([$filterGroup]);
+$items = $ruleRepository->getList($searchCriteria)->getItems();
+if ($items) {
     try {
-        $ruleRepository->deleteById($ruleId);
-        $registry->unregister('Magento/SalesRule/_files/cart_rule_40_percent_off');
+        foreach ($items as $item) {
+            $ruleRepository->deleteById($item->getRuleId());
+        }
     } catch (NoSuchEntityException $e) {
     }
 }