ACP2E-3063: [Cloud] Cache is not getting invalidated.

- with test

Author: arnobsh

dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php

@@ -8,10 +8,13 @@
 
 namespace Magento\Catalog\Model;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Catalog\Model\Product\Copier;
 use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Test\Fixture\Product as ProductFixture;
+use Magento\Framework\App\Cache\Type\Block;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\InputException;
@@ -21,8 +24,11 @@
 use Magento\Framework\Math\Random;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Store\Model\Store;
+use Magento\TestFramework\Fixture\DataFixture;
+use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
+use Magento\Widget\Model\Widget\Instance;
 
 /**
  * Tests product model:
@@ -54,13 +60,19 @@ class ProductTest extends \PHPUnit\Framework\TestCase
      */
     private $objectManager;
 
+    /**
+     * @var DataFixtureStorageManager
+     */
+    private $fixtures;
+
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $this->fixtures = DataFixtureStorageManager::getStorage();
         $this->_model = $this->objectManager->create(Product::class);
     }
 
@@ -869,4 +881,33 @@ public function testSetPriceWithoutTypeId()
         $product = $this->productRepository->get('some_sku', false, null, true);
         $this->assertEquals(9.95, $product->getPrice());
     }
+
+    /**
+     * Tests case for product saving invalidate cache successfully
+     */
+    #[
+        DataFixture(ProductFixture::class,
+            ['sku' => 'simple1', 'price' => 10, 'page_layout' => '1column'], as: 'product'
+        ),
+    ]
+    public function testSavingProductInAdminWithLayoutChangeWillInvalidateCache()
+    {
+        /** @var ProductInterface $product */
+        $product = $this->fixtures->get('product');
+        $product->setStatus(Status::STATUS_ENABLED);
+        $this->productRepository->save($product);
+        $blockHtmlCache = $this->objectManager->get(
+            Block::class
+        );
+        $cacheKey = sprintf(
+                    '%s',
+                    str_replace('{{ID}}', (string) $product->getId(), Instance::SINGLE_PRODUCT_LAYOUT_HANDLE)
+                );
+
+        $product->setPageLayout('cms-full-width');
+        $this->productRepository->save($product);
+        $this->assertFalse(
+            $blockHtmlCache->test($cacheKey)
+        );
+    }
 }

dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php

@@ -8,8 +8,12 @@
 
 use Magento\Cms\Api\GetPageByIdentifierInterface;
 use Magento\Cms\Model\Page\CustomLayoutManagerInterface;
+use Magento\Framework\App\Cache\Type\Block;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\View\LayoutInterface;
 use Magento\TestFramework\Cms\Model\CustomLayoutManager;
+use Magento\Cms\Api\PageRepositoryInterface;
 use Magento\TestFramework\TestCase\AbstractController;
 
 /**
@@ -126,6 +130,7 @@ public function testHomePageCustomHandles(): void
      * @dataProvider pageLayoutDataProvider
      * @param string $pageIdentifier
      * @return void
+     * @throws NoSuchEntityException
      */
     public function testPageWithCustomLayout(string $pageIdentifier): void
     {
@@ -147,4 +152,38 @@ public static function pageLayoutDataProvider(): array
             'Page with unavailable layout' => ['page-with-unavailable-layout']
         ];
     }
+
+    /**
+     * Tests page renders with changed layout
+     *
+     * @magentoDataFixture Magento/Cms/Fixtures/page_list.php
+     * @return void
+     * @throws NoSuchEntityException|LocalizedException
+     */
+    public function testPageWithChangedLayoutCanCleanCacheTag(): void
+    {
+        $pageIdentifier = 'page-with-1column-layout';
+        $blockHtmlCache = $this->_objectManager->get(
+            Block::class
+        );
+        $page = $this->pageRetriever->execute($pageIdentifier, 0);
+        $cacheKey = sprintf(
+                    '%s_%s',
+                    'CMS_PAGE_VIEW_ID',
+                    str_replace('-', '_', strtoupper($page->getId()))
+                );
+
+        $this->dispatch('/cms/page/view/page_id/' . $page->getId());
+        $this->assertStringContainsString(
+            '<main id="maincontent" class="page-main">',
+            $this->getResponse()->getBody()
+        );
+        $pageRepository = $this->_objectManager->get(PageRepositoryInterface::class);
+        $page->setPageLayout('cms-full-width');
+        $pageRepository->save($page);
+        $this->dispatch('/cms/page/view/page_id/' . $page->getId());
+        $this->assertFalse(
+            $blockHtmlCache->test($cacheKey)
+        );
+    }
 }