Merge branch 'MC-40076' into 2.4-develop-sidecar-pr13

Author: ysapiga

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

@@ -13,17 +13,21 @@
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Eav\Model\Entity\Type;
+use Magento\Framework\App\ActionInterface;
 use Magento\Framework\App\Cache\Manager;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Http;
+use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Framework\Registry;
+use Magento\Framework\Url\EncoderInterface;
+use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Eav\Model\GetAttributeSetByName;
 use Magento\TestFramework\Request;
 use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LoggerInterface;
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
-use Magento\Framework\Logger\Monolog as MagentoMonologLogger;
 use Magento\TestFramework\Response;
 use Magento\TestFramework\TestCase\AbstractController;
 
@@ -66,6 +70,12 @@ class ViewTest extends AbstractController
     /** @var GetAttributeSetByName */
     private $getAttributeSetByName;
 
+    /** @var EncoderInterface */
+    private $urlEncoder;
+
+    /** @var ScopeConfigInterface */
+    private $config;
+
     /**
      * @inheritdoc
      */
@@ -81,6 +91,8 @@ protected function setUp(): void
         $this->registry = $this->_objectManager->get(Registry::class);
         $this->storeManager = $this->_objectManager->get(StoreManagerInterface::class);
         $this->getAttributeSetByName = $this->_objectManager->get(GetAttributeSetByName::class);
+        $this->urlEncoder = $this->_objectManager->get(EncoderInterface::class);
+        $this->config = $this->_objectManager->get(ScopeConfigInterface::class);
     }
 
     /**
@@ -294,6 +306,37 @@ public function test404NotFoundPageCacheTags(): void
         );
     }
 
+    /**
+     * @return void
+     */
+    public function testViewUnexistedProduct(): void
+    {
+        $url = '/catalog/product/view/id/999/';
+        $this->getRequest()->setParams([
+            ActionInterface::PARAM_NAME_URL_ENCODED => $this->urlEncoder->encode($url),
+        ])->setMethod(HttpRequest::METHOD_POST);
+        $this->dispatch($url);
+        $this->assert404NotFound();
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     *
+     * @return void
+     */
+    public function testViewWithRedirect(): void
+    {
+        $product = $this->productRepository->get('simple2');
+        $url = $this->config->getValue(Store::XML_PATH_UNSECURE_BASE_LINK_URL);
+        $this->getRequest()
+            ->setParams([
+                ActionInterface::PARAM_NAME_URL_ENCODED => $this->urlEncoder->encode($url),
+            ])
+            ->setMethod(HttpRequest::METHOD_POST);
+        $this->dispatch(sprintf('catalog/product/view/id/%s/', $product->getId()));
+        $this->assertRedirect($this->stringContains($url));
+    }
+
     /**
      * @param string|ProductInterface $product
      * @param array $data