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

- improvements for updated PAT failures

Author: aplapana

app/code/Magento/Catalog/Pricing/Price/SpecialPriceBulkResolver.php

@@ -21,7 +21,6 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\Product;
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Eav\Model\Entity\Collection\AbstractCollection;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Cache\FrontendInterface;
@@ -179,7 +178,7 @@ private function saveCachedData(string $cacheKey, array $data, array $productTag
         ];
         $productTags = array_unique($productTags);
         foreach ($productTags as $tag) {
-            $tags[] = Configurable::TYPE_CODE . '_' . $tag;
+            $tags[] = Product::CACHE_TAG . '_' . $tag;
         }
 
         return $this->cache->save(json_encode($data), $cacheKey, $tags, $this->cacheLifeTime);

app/code/Magento/Catalog/Pricing/Price/SpecialPriceBulkResolverInterface.php

@@ -1,4 +1,20 @@
 <?php
+/************************************************************************
+ *
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * ************************************************************************
+ */
+declare(strict_types=1);
 
 namespace Magento\Catalog\Pricing\Price;
 

app/code/Magento/Catalog/Test/Unit/Block/Product/ListProductTest.php

@@ -143,8 +143,8 @@ protected function setUp(): void
         $this->context->expects($this->any())->method('getEventManager')->willReturn($eventManager);
         $storeManager = $this->createMock(StoreManagerInterface::class);
         $store = $this->createMock(StoreInterface::class);
-        $storeManager->expects($this->once())->method('getStore')->willReturn($store);
-        $this->context->expects($this->once())->method('getStoreManager')->willReturn($storeManager);
+        $storeManager->expects($this->any())->method('getStore')->willReturn($store);
+        $this->context->expects($this->any())->method('getStoreManager')->willReturn($storeManager);
 
         $this->block = $objectManager->getObject(
             ListProduct::class,

app/code/Magento/Catalog/Test/Unit/Pricing/Price/SpecialPriceBulkResolverTest.php

@@ -126,7 +126,7 @@ public function testGenerateSpecialPriceMapCollection(): void
                 'e.entity_id'
             ]
         )->willReturnSelf();
-        $connection->expects($this->once())->method('fetchAssoc')->willReturn(
+        $connection->expects($this->once())->method('fetchAll')->willReturn(
             [
                 [
                     'product_id' => 2,