Skip to content

Commit ba521f4

Browse files
committed
#30463:Dynamic blocks implementation - fixed rollbacks for webapi tests
1 parent 1e846a4 commit ba521f4

File tree

2 files changed

+40
-12
lines changed

2 files changed

+40
-12
lines changed

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

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,27 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
67
declare(strict_types=1);
78

8-
/** @var Magento\Framework\Registry $registry */
9-
$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
9+
use Magento\Framework\Exception\NoSuchEntityException;
10+
use Magento\Framework\Registry;
11+
use Magento\SalesRule\Api\RuleRepositoryInterface;
12+
use Magento\TestFramework\Helper\Bootstrap;
13+
14+
$bootstrap = Bootstrap::getObjectManager();
15+
16+
/** @var Registry $registry */
17+
$registry = $bootstrap->get(Registry::class);
18+
19+
/** @var RuleRepositoryInterface $ruleRepository */
20+
$ruleRepository = $bootstrap->get(RuleRepositoryInterface::class);
1021

11-
/** @var Magento\SalesRule\Model\Rule $rule */
12-
$rule = $registry->registry('cart_rule_40_percent_off');
13-
if ($rule) {
14-
$rule->delete();
22+
$ruleId = $registry->registry('Magento/SalesRule/_files/cart_rule_40_percent_off');
23+
if ($ruleId) {
24+
try {
25+
$ruleRepository->deleteById($ruleId);
26+
$registry->unregister('Magento/SalesRule/_files/cart_rule_40_percent_off');
27+
} catch (NoSuchEntityException $e) {
28+
}
1529
}

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

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,27 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
67
declare(strict_types=1);
78

8-
/** @var Magento\Framework\Registry $registry */
9-
$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
9+
use Magento\Framework\Exception\NoSuchEntityException;
10+
use Magento\Framework\Registry;
11+
use Magento\SalesRule\Api\RuleRepositoryInterface;
12+
use Magento\TestFramework\Helper\Bootstrap;
13+
14+
$bootstrap = Bootstrap::getObjectManager();
15+
16+
/** @var Registry $registry */
17+
$registry = $bootstrap->get(Registry::class);
18+
19+
/** @var RuleRepositoryInterface $ruleRepository */
20+
$ruleRepository = $bootstrap->get(RuleRepositoryInterface::class);
1021

11-
/** @var Magento\SalesRule\Model\Rule $rule */
12-
$rule = $registry->registry('cart_rule_50_percent_off');
13-
if ($rule) {
14-
$rule->delete();
22+
$ruleId = $registry->registry('Magento/SalesRule/_files/cart_rule_50_percent_off');
23+
if ($ruleId) {
24+
try {
25+
$ruleRepository->deleteById($ruleId);
26+
$registry->unregister('Magento/SalesRule/_files/cart_rule_50_percent_off');
27+
} catch (NoSuchEntityException $e) {
28+
}
1529
}

0 commit comments

Comments
 (0)