ACP2E-2522: Block Content not rendering in PDP meta description

Author: thiaramus

app/code/Magento/Catalog/Helper/Product/View.php

@@ -130,14 +130,8 @@ private function preparePageMetadata(ResultPage $resultPage, $product)
             $pageConfig->setKeywords($product->getName());
         }
 
-        $description = $product->getMetaDescription();
-        if ($description) {
-            $pageConfig->setDescription($description);
-        } else {
-            $productDescription = is_string($product->getDescription()) ?
-                $this->string->substr(strip_tags($product->getDescription()), 0, 255) : '';
-            $pageConfig->setDescription($productDescription);
-        }
+        $description = $product->getMetaDescription() ?: $product->getName();
+        $pageConfig->setDescription($description);
 
         if ($this->_catalogProduct->canUseCanonicalTag()) {
             $pageConfig->addRemotePageAsset(

dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/ViewTest.php

@@ -5,7 +5,14 @@
  */
 namespace Magento\Catalog\Helper\Product;
 
+use Magento\Catalog\Test\Fixture\Product as ProductFixture;
 use Magento\Customer\Model\Context;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\TestFramework\Fixture\AppIsolation;
+use Magento\TestFramework\Fixture\DataFixture;
+use Magento\TestFramework\Fixture\DataFixtureStorage;
+use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 
 /**
  * @magentoAppArea frontend
@@ -33,10 +40,15 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     protected $objectManager;
 
+    /**
+     * @var DataFixtureStorage
+     */
+    private $fixtures;
+
     protected function setUp(): void
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
+        $this->fixtures = DataFixtureStorageManager::getStorage();
         $this->objectManager->get(\Magento\Framework\App\State::class)->setAreaCode('frontend');
         $this->objectManager->get(\Magento\Framework\App\Http\Context::class)
             ->setValue(Context::CONTEXT_AUTH, false, false);
@@ -124,6 +136,70 @@ public function testPrepareAndRender()
         );
     }
 
+    /**
+     * Product meta description should be rendered on the product HTML sources as is, without changes or substitutions
+     *
+     * @return void
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    #[
+        AppIsolation(true),
+        DataFixture(ProductFixture::class, ['meta_description' => 'Product Meta Description'], 'p1'),
+    ]
+    public function testProductMetaDescriptionShouldBeRenderedAsIs()
+    {
+        $product = $this->fixtures->get('p1');
+        $metaDescription = '<meta name="description" content="Product Meta Description"/>';
+
+        $this->objectManager->get(\Magento\Framework\App\RequestInterface::class)->setParam('id', $product->getId());
+        $this->_helper->prepareAndRender($this->page, $product->getId(), $this->_controller);
+
+        /** @var \Magento\TestFramework\Response $response */
+        $response = $this->objectManager->get(\Magento\TestFramework\Response::class);
+
+        $this->page->renderResult($response);
+
+        $this->assertNotEmpty($response->getBody());
+        $this->assertStringContainsString(
+            $metaDescription,
+            $response->getBody(),
+            'Empty meta description should be rendered as is'
+        );
+    }
+
+    /**
+     * If the product meta description is empty, it should be substituted with the product name
+     *
+     * @return void
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    #[
+        AppIsolation(true),
+        DataFixture(ProductFixture::class, ['meta_description' => ''], 'p1'),
+    ]
+    public function testEmptyProductMetaDescriptionShouldNotBeSubstitutedAndRendered()
+    {
+        $product = $this->fixtures->get('p1');
+        $metaDescription = sprintf('<meta name="description" content="%s"/>', $product->getName());
+
+        $this->objectManager->get(\Magento\Framework\App\RequestInterface::class)->setParam('id', $product->getId());
+        $this->_helper->prepareAndRender($this->page, $product->getId(), $this->_controller);
+
+        /** @var \Magento\TestFramework\Response $response */
+        $response = $this->objectManager->get(\Magento\TestFramework\Response::class);
+
+        $this->page->renderResult($response);
+
+        $this->assertNotEmpty($response->getBody());
+        $this->assertStringContainsStringIgnoringCase(
+            $metaDescription,
+            $response->getBody(),
+            'Empty meta description should be substituted with the product name'
+        );
+    }
+
     /**
      * @magentoAppIsolation enabled
      */