Merge remote-tracking branch 'l3/ACP2E-2522-V2' into Tier4-PR-Delivery-11-18-23

Author: veloraven

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

@@ -130,14 +130,7 @@ 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);
-        }
+        $pageConfig->setDescription($product->getMetaDescription());
 
         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,71 @@ 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 not be substituted with any other data and should not be
+     * rendered on the product HTML sources
+     *
+     * @return void
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    #[
+        AppIsolation(true),
+        DataFixture(ProductFixture::class, ['meta_description' => ''], 'p1'),
+    ]
+    public function testEmptyProductMetaDescriptionShouldNotBeSubstitutedAndRendered()
+    {
+        $product = $this->fixtures->get('p1');
+        $metaDescription = '<meta name="description" content="';
+
+        $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->assertStringNotContainsStringIgnoringCase(
+            $metaDescription,
+            $response->getBody(),
+            'Empty meta description should not be substituted or rendered'
+        );
+    }
+
     /**
      * @magentoAppIsolation enabled
      */

setup/src/Magento/Setup/Fixtures/SimpleProductsFixture.php

@@ -39,7 +39,7 @@ class SimpleProductsFixture extends Fixture
     /**
      * Simple product sku pattern
      */
-    const SKU_PATTERN = 'product_dynamic_%s';
+    public const SKU_PATTERN = 'product_dynamic_%s';
 
     /**
      * @var int
@@ -257,6 +257,12 @@ public function execute()
             'category_ids' => function ($index, $entityNumber) {
                 return $this->websiteCategoryProvider->getCategoryId($index);
             },
+            'meta_keyword' => function ($productId) {
+                return sprintf($this->getSkuPattern(), $productId);
+            },
+            'meta_title' => function ($productId) {
+                return sprintf($this->getSkuPattern(), $productId);
+            },
             'attribute_set_id' => $attributeSet,
             'additional_attributes' => $additionalAttributes,
             'status' => function () {

setup/src/Magento/Setup/Model/FixtureGenerator/SimpleProductTemplateGenerator.php

@@ -39,7 +39,7 @@ public function __construct(ProductFactory $productFactory, array $fixture)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function generateEntity()
     {
@@ -70,6 +70,9 @@ private function getProductTemplate($attributeSet, $additionalAttributes = [])
                 'name' => 'template name' . $productRandomizerNumber,
                 'url_key' => 'template-url' . $productRandomizerNumber,
                 'sku' => 'template_sku_simple' . $productRandomizerNumber,
+                'meta_description' => 'Simple Product',
+                'meta_keyword' => $productRandomizerNumber,
+                'meta_title' => $productRandomizerNumber,
                 'price' => 10,
                 'visibility' => Visibility::VISIBILITY_BOTH,
                 'status' => Status::STATUS_ENABLED,