MC-21685: View simple product on storefront

Author: ysapiga

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

@@ -75,9 +75,7 @@ public function testDisabledProductInvisibility(): void
      */
     public function testProductVisibility(int $visibility): void
     {
-        $product = $this->productRepository->get('simple2');
-        $product->setVisibility($visibility);
-        $this->productRepository->save($product);
+        $product = $this->updateProductVisibility('simple2', $visibility);
         $this->dispatch(sprintf('catalog/product/view/id/%s/', $product->getId()));
 
         $this->assertProductIsVisible($product);
@@ -95,6 +93,17 @@ public function productVisibilityDataProvider(): array
         ];
     }
 
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/simple_products_not_visible_individually.php
+     */
+    public function testProductNotVisibleIndividually(): void
+    {
+        $product = $this->updateProductVisibility('simple_not_visible_1', Visibility::VISIBILITY_NOT_VISIBLE);
+        $this->dispatch(sprintf('catalog/product/view/id/%s/', $product->getId()));
+
+        $this->assert404NotFound();
+    }
+
     /**
      * @inheritdoc
      */
@@ -124,4 +133,19 @@ private function assertProductIsVisible(ProductInterface $product): void
             'Wrong product is registered'
         );
     }
+
+    /**
+     * Update product visibility
+     *
+     * @param string $sku
+     * @param int $visibility
+     * @return ProductInterface
+     */
+    private function updateProductVisibility(string $sku, int $visibility): ProductInterface
+    {
+        $product = $this->productRepository->get($sku);
+        $product->setVisibility($visibility);
+
+        return $this->productRepository->save($product);
+    }
 }