Skip to content

Commit 73314c6

Browse files
MC-30809: Indexer price calculation for configurable product
1 parent 2c09a86 commit 73314c6

File tree

3 files changed

+18
-20
lines changed

3 files changed

+18
-20
lines changed

dev/tests/integration/testsuite/Magento/CatalogRuleConfigurable/_files/configurable_product_with_percent_rule.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111
use Magento\CatalogRule\Model\Rule\Condition\Product;
1212
use Magento\CatalogRule\Model\RuleFactory;
1313
use Magento\Customer\Model\Group;
14+
use Magento\Framework\App\Area;
1415
use Magento\Store\Api\WebsiteRepositoryInterface;
1516
use Magento\Store\Model\StoreManagerInterface;
1617
use Magento\TestFramework\Helper\Bootstrap;
1718

1819
require __DIR__ . '/../../ConfigurableProduct/_files/configurable_product_with_custom_option_and_simple_tier_price.php';
19-
Bootstrap::getInstance()->loadArea('adminhtml');
20+
Bootstrap::getInstance()->loadArea(Area::AREA_ADMINHTML);
2021

2122
/** @var StoreManagerInterface $storeManager */
2223
$storeManager = $objectManager->get(StoreManagerInterface::class);

dev/tests/integration/testsuite/Magento/CatalogRuleConfigurable/_files/configurable_product_with_percent_rule_rollback.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,18 @@
1111
use Magento\CatalogRule\Model\Rule;
1212
use Magento\TestFramework\Helper\Bootstrap;
1313

14+
require __DIR__ . '/../../ConfigurableProduct/_files/configurable_product_with_custom_option_and_simple_tier_price_rollback.php';
15+
1416
$objectManager = Bootstrap::getObjectManager();
15-
/** @var IndexBuilder $indexBuilder */
16-
$indexBuilder = $objectManager->get(IndexBuilder::class);
1717
/** @var CatalogRuleRepositoryInterface $ruleRepository */
1818
$ruleRepository = $objectManager->create(CatalogRuleRepositoryInterface::class);
1919
/** @var CollectionFactory $ruleCollectionFactory */
2020
$ruleCollectionFactory = $objectManager->get(CollectionFactory::class);
21-
$ruleCollection = $ruleCollectionFactory->create();
22-
$ruleCollection->addFieldToFilter('name', ['eq' => 'Percent rule for configurable product']);
23-
$ruleCollection->setPageSize(1);
21+
$ruleCollection = $ruleCollectionFactory->create()
22+
->addFieldToFilter('name', ['eq' => 'Percent rule for configurable product'])
23+
->setPageSize(1);
2424
/** @var Rule $rule */
2525
$rule = $ruleCollection->getFirstItem();
2626
if ($rule->getId()) {
2727
$ruleRepository->delete($rule);
2828
}
29-
$indexBuilder->reindexFull();

dev/tests/integration/testsuite/Magento/CatalogRuleConfigurable/_files/configurable_product_with_percent_rules_for_children_rollback.php

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,23 @@
1010
use Magento\CatalogRule\Model\ResourceModel\Rule\CollectionFactory;
1111
use Magento\TestFramework\Helper\Bootstrap;
1212

13+
require __DIR__ . '/configurable_product_with_percent_rule_rollback.php';
14+
1315
$objectManager = Bootstrap::getObjectManager();
14-
/** @var IndexBuilder $indexBuilder */
15-
$indexBuilder = $objectManager->get(IndexBuilder::class);
1616
/** @var CatalogRuleRepositoryInterface $ruleRepository */
1717
$ruleRepository = $objectManager->create(CatalogRuleRepositoryInterface::class);
1818
/** @var CollectionFactory $ruleCollectionFactory */
1919
$ruleCollectionFactory = $objectManager->get(CollectionFactory::class);
20-
$ruleCollection = $ruleCollectionFactory->create();
21-
$ruleCollection->addFieldToFilter(
22-
'name',
23-
[
24-
'in' => [
25-
'Percent rule for configurable product',
26-
'Percent rule for first simple product',
27-
'Percent rule for second simple product',
20+
$ruleCollection = $ruleCollectionFactory->create()
21+
->addFieldToFilter(
22+
'name',
23+
[
24+
'in' => [
25+
'Percent rule for first simple product',
26+
'Percent rule for second simple product',
27+
]
2828
]
29-
]
30-
);
29+
);
3130
foreach ($ruleCollection as $rule) {
3231
$ruleRepository->delete($rule);
3332
}
34-
$indexBuilder->reindexFull();

0 commit comments

Comments
 (0)