MC-35065: Catalog pricerules are not working with custom options as expected in Magento 2.3.0 product details page

Author: OlgaVasyltsun

app/code/Magento/CatalogRule/Model/Rule.php

@@ -895,4 +895,12 @@ public function getIdentities()
     {
         return ['price'];
     }
+
+    /**
+     * Clear price rules cache.
+     */
+    public function clearPriceRulesData(): void
+    {
+        self::$_priceRulesData = [];
+    }
 }

app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithSelectFixedMethodTest.xml

@@ -19,9 +19,6 @@
             <group value="mtf_migrated"/>
         </annotations>
         <before>
-            <!-- Login as Admin -->
-            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-
             <!-- Create category -->
             <createData entity="_defaultCategory" stepKey="createCategory"/>
 
@@ -33,7 +30,12 @@
 
             <!-- Update all products to have custom options -->
             <updateData createDataKey="createProduct1" entity="productWithFixedOptions" stepKey="updateProductWithOptions1"/>
-            <magentoCron groups="index" stepKey="runCronIndex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+
+            <!-- Login as Admin -->
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
             <!-- Delete products and category -->
@@ -60,7 +62,9 @@
         <actionGroup ref="SelectNotLoggedInCustomerGroupActionGroup" stepKey="selectNotLoggedInCustomerGroup"/>
 
         <!-- Save and apply the new catalog price rule -->
-        <actionGroup ref="AdminEnableCatalogPriceRuleActionGroup" stepKey="saveAndApplyCatalogPriceRule"/>
+        <conditionalClick selector="{{AdminNewCatalogPriceRule.active}}" dependentSelector="{{AdminNewCatalogPriceRule.activeIsEnabled}}" visible="false" stepKey="enableActiveBtn"/>
+        <click selector="{{AdminNewCatalogPriceRule.save}}" stepKey="clickSave"/>
+        <waitForPageLoad stepKey="waitForSave"/>
 
         <!-- Navigate to category on store front -->
         <amOnPage url="{{StorefrontProductPage.url($createCategory.name$)}}" stepKey="goToStorefrontCategoryPage"/>

dev/tests/integration/testsuite/Magento/Bundle/Model/Product/BundlePriceAbstract.php

@@ -30,6 +30,11 @@ abstract class BundlePriceAbstract extends \PHPUnit\Framework\TestCase
      */
     protected $productCollectionFactory;
 
+    /**
+     * @var \Magento\CatalogRule\Model\RuleFactory
+     */
+    private $ruleFactory;
+
     protected function setUp(): void
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -43,6 +48,7 @@ protected function setUp(): void
             true,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
+        $this->ruleFactory = $this->objectManager->get(\Magento\CatalogRule\Model\RuleFactory::class);
     }
 
     /**
@@ -62,6 +68,8 @@ abstract public function getTestCases();
      */
     protected function prepareFixture($strategyModifiers, $productSku)
     {
+        $this->ruleFactory->create()->clearPriceRulesData();
+
         $bundleProduct = $this->productRepository->get($productSku);
 
         foreach ($strategyModifiers as $modifier) {