ACP2E-2266: add itemprop for main image for all product types

Author: alzota

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

@@ -7,8 +7,13 @@
 
 namespace Magento\Catalog\Controller;
 
+use Magento\Bundle\Test\Fixture\Link as BundleSelectionFixture;
+use Magento\Bundle\Test\Fixture\Option as BundleOptionFixture;
+use Magento\Bundle\Test\Fixture\Product as BundleProductFixture;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\ConfigurableProduct\Test\Fixture\Attribute as AttributeFixture;
+use Magento\ConfigurableProduct\Test\Fixture\Product as ConfigurableProductFixture;
 use Magento\Catalog\Model\Session;
 use Magento\Catalog\Test\Fixture\Category;
 use Magento\Catalog\Test\Fixture\Product;
@@ -267,32 +272,73 @@ public function testViewWithCustomUpdate(): void
         $this->assertContains("catalog_product_view_selectable_{$sku}_{$file}", $handles);
     }
 
+    /**
+     * Validate itemprop generation on different product types' page
+     *
+     * @return void
+     */
     #[
         DataFixture(Category::class, as: 'category'),
         DataFixture(
             Product::class,
             ['category_ids' => ['$category.id$'], 'short_description' => 'Product Short Description'],
-            as: 'product'
-        )
+            as: 'sp'
+        ),
+        DataFixture(AttributeFixture::class, ['options' => [['label' => 'option1', 'sort_order' => 0]]], as: 'attr'),
+        DataFixture(
+            ConfigurableProductFixture::class,
+            [
+                'short_description' => 'Configurable Product Short Description',
+                '_options' => ['$attr$'],
+                '_links' => ['$sp$']
+            ],
+            as: 'cp'
+        ),
+        DataFixture(BundleSelectionFixture::class, ['sku' => '$sp.sku$'], 'link1'),
+        DataFixture(BundleOptionFixture::class, ['product_links' => ['$link1$']], 'opt1'),
+        DataFixture(
+            BundleProductFixture::class,
+            [
+                'short_description' => 'Bundle Product Short Description',
+                'sku' => 'bundle1',
+                '_options' => ['$opt1$']
+            ],
+            as:'bp'
+        ),
     ]
     public function testItempropOnProductPage()
     {
-        $product = $this->fixture->get('product');
-        $this->dispatch(sprintf('catalog/product/view/id/%s', $product->getEntityId()));
+        $product = $this->fixture->get('sp');
+        $this->checkItemProp($product);
+        $bundleProduct = $this->fixture->get('bp');
+        $this->checkItemProp($bundleProduct);
+        $configurableProduct = $this->fixture->get('cp');
+        $this->checkItemProp($configurableProduct);
+    }
+
+    /**
+     * Validate presence of itemprop for image and description
+     *
+     * @param ProductInterface $product
+     * @return void
+     */
+    private function checkItemProp(ProductInterface $product)
+    {
+        $this->dispatch(sprintf('catalog/product/view/id/%s', $product->getId()));
         $html = $this->getResponse()->getBody();
-        $this->assertEquals(
-            1,
+        $this->assertNotEmpty(
             Xpath::getElementsCountForXpath(
                 '//*[@itemprop="image"]',
                 $html
-            )
+            ),
+            'itemprop image doesn\'t match for product type '.$product->getTypeId()
         );
-        $this->assertEquals(
-            1,
+        $this->assertNotEmpty(
             Xpath::getElementsCountForXpath(
                 '//*[@itemprop="description"]',
                 $html
-            )
+            ),
+            'itemprop description doesn\'t match for product type '.$product->getTypeId()
         );
     }
 }