MC-33493: Test render fields in composite configure block for simple and configurable product

Author: romadjelf

dev/tests/integration/testsuite/Magento/Catalog/Block/Product/View/Options/AbstractRenderCustomOptionsTest.php

@@ -373,7 +373,7 @@ protected function addOptionToProduct(
      */
     protected function getOptionHtml(ProductInterface $product): string
     {
-        $this->page->addHandle($this->getHandlesList($product));
+        $this->page->addHandle($this->getHandlesList());
         $this->page->getLayout()->generateXml();
         /** @var Options $optionsBlock */
         $optionsBlock = $this->page->getLayout()->getBlock($this->getOptionsBlockName());

dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_currency_rollback.php

@@ -4,24 +4,35 @@
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
+
+use Magento\Config\Model\ResourceModel\Config;
+use Magento\Directory\Model\Currency as ModelCurrency;
+use Magento\Directory\Model\ResourceModel\Currency as ResourceCurrency;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
+use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-$store = $objectManager->create(\Magento\Store\Model\Store::class);
+$objectManager = Bootstrap::getObjectManager();
+$store = $objectManager->create(Store::class);
 $storeId = $store->load('fixture_second_store', 'code')->getId();
 
 if ($storeId) {
-    $configResource = $objectManager->get(\Magento\Config\Model\ResourceModel\Config::class);
+    $configResource = $objectManager->get(Config::class);
     $configResource->deleteConfig(
-        \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_DEFAULT,
-        \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
+        ModelCurrency::XML_PATH_CURRENCY_DEFAULT,
+        ScopeInterface::SCOPE_STORES,
         $storeId
     );
     $configResource->deleteConfig(
-        \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_ALLOW,
-        \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
+        ModelCurrency::XML_PATH_CURRENCY_ALLOW,
+        ScopeInterface::SCOPE_STORES,
         $storeId
     );
 }
 
 Resolver::getInstance()->requireDataFixture('Magento/Store/_files/second_store_rollback.php');
+$reflectionClass = new \ReflectionClass(ResourceCurrency::class);
+$staticProperty = $reflectionClass->getProperty('_rateCache');
+$staticProperty->setAccessible(true);
+$staticProperty->setValue(null);