ACP2E-2224: Regular Price does not show on PLP for Configurable Product

- improvements for updated PAT failures

Author: aplapana

app/code/Magento/Catalog/Block/Product/ListProduct.php

@@ -446,7 +446,7 @@ protected function getPriceRender()
         if ($this->specialPriceMap === null) {
             $this->specialPriceMap = $this->specialPriceBulkResolver->generateSpecialPriceMap(
                 (int)$this->_storeManager->getStore()->getId(),
-                $this->_productCollection
+                $this->_getProductCollection()
             );
         }
 

dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListProduct/CheckProductPriceTest.php

@@ -7,6 +7,7 @@
 
 namespace Magento\Catalog\Block\Product\ListProduct;
 
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Block\Product\ListProduct;
 use Magento\Catalog\Test\Fixture\Category as CategoryFixture;
@@ -52,6 +53,11 @@ class CheckProductPriceTest extends TestCase
      */
     private $customerSession;
 
+    /**
+     * @var Collection
+     */
+    private $productCollection;
+
     /**
      * @inheritdoc
      */
@@ -61,6 +67,7 @@ protected function setUp(): void
         $this->pageFactory = $this->objectManager->get(PageFactory::class);
         $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
         $this->customerSession = $this->objectManager->create(Session::class);
+        $this->productCollection = $this->objectManager->create(Collection::class);
         parent::setUp();
     }
 
@@ -120,6 +127,7 @@ public function testCheckProductPriceWithoutAdditionalPriceConfigurations(): voi
      * Assert that product special price rendered correctly.
      *
      * @magentoDataFixture Magento/Catalog/_files/product_special_price.php
+     * @magentoDbIsolation disabled
      *
      * @return void
      */
@@ -162,6 +170,7 @@ public function testCheckPercentTierPrice(): void
      * Assert that price of product with fixed tier price for not logged user is renders correctly.
      *
      * @magentoDataFixture Magento/Catalog/_files/product_simple_with_fixed_tier_price_for_not_logged_user.php
+     * @magentoDbIsolation disabled
      *
      * @return void
      */
@@ -356,6 +365,9 @@ private function assertRegularPrice(string $priceHtml, float $expectedPrice): vo
     private function getProductPriceHtml(string $sku): string
     {
         $product = $this->productRepository->get($sku, false, null, true);
+        if (false === in_array($product->getId(), $this->productCollection->getAllIds())) {
+            $this->productCollection->addItem($product);
+        }
 
         return preg_replace('/[\n\r]/', '', $this->getListProductBlock()->getProductPrice($product));
     }
@@ -375,6 +387,8 @@ private function getListProductBlock(): ListProduct
         $page->getLayout()->generateXml();
         /** @var Template $categoryProductsBlock */
         $categoryProductsBlock = $page->getLayout()->getBlock('category.products');
+        $listProduct = $categoryProductsBlock->getChildBlock('product_list');
+        $listProduct->setCollection($this->productCollection);
 
         return $categoryProductsBlock->getChildBlock('product_list');
     }

dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagTest.php

@@ -102,6 +102,7 @@ public function testRenderingByDefault()
     public function testRenderingAccordingToIsProductListFlag($flag)
     {
         $this->finalPriceBox->setData('is_product_list', $flag);
+        $this->finalPriceBox->setData('special_price_map', [$this->product->getId() => true]);
         $html = $this->finalPriceBox->toHtml();
         self::assertStringContainsString('5.99', $html);
         $this->assertGreaterThanOrEqual(

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableViewOnCategoryPageTest.php

@@ -126,7 +126,7 @@ public function testCheckConfigurablePriceOnSecondWebsite(): void
             'fixture_second_store',
             [$this, 'assertProductPrice'],
             'configurable',
-            __('As low as') . ' $10.00 '
+            __('As low as') . ' $10.00'
         );
         $this->resetPageLayout();
         $this->assertProductPrice('configurable', '$150.00');