ENGCOM-5253: [Backport] #23053 : sendfriend verifies product visibility instead of status #23121

Author: VladimirZaets

app/code/Magento/SendFriend/Controller/Product.php

@@ -102,7 +102,7 @@ protected function _initProduct()
         }
         try {
             $product = $this->productRepository->getById($productId);
-            if (!$product->isVisibleInCatalog()) {
+            if (!$product->isVisibleInSiteVisibility() || !$product->isVisibleInCatalog()) {
                 return false;
             }
         } catch (NoSuchEntityException $noEntityException) {

app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendTest.php

@@ -104,7 +104,7 @@ public function testExecute()
 
         /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
         $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->setMethods(['isVisibleInCatalog'])
+            ->setMethods(['isVisibleInCatalog', 'isVisibleInSiteVisibility'])
             ->getMockForAbstractClass();
 
         $this->productRepositoryMock->expects($this->once())
@@ -116,6 +116,10 @@ public function testExecute()
             ->method('isVisibleInCatalog')
             ->willReturn(true);
 
+        $productMock->expects($this->once())
+            ->method('isVisibleInSiteVisibility')
+            ->willReturn(true);
+
         $this->registryMock->expects($this->once())
             ->method('register')
             ->with('product', $productMock, false);
@@ -193,7 +197,7 @@ public function testExecuteWithoutBlock()
 
         /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
         $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->setMethods(['isVisibleInCatalog'])
+            ->setMethods(['isVisibleInCatalog', 'isVisibleInSiteVisibility'])
             ->getMockForAbstractClass();
 
         $this->productRepositoryMock->expects($this->once())
@@ -205,6 +209,10 @@ public function testExecuteWithoutBlock()
             ->method('isVisibleInCatalog')
             ->willReturn(true);
 
+        $productMock->expects($this->once())
+            ->method('isVisibleInSiteVisibility')
+            ->willReturn(true);
+
         $this->registryMock->expects($this->once())
             ->method('register')
             ->with('product', $productMock, false);
@@ -269,7 +277,7 @@ public function testExecuteWithNoticeAndNoData()
 
         /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
         $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->setMethods(['isVisibleInCatalog'])
+            ->setMethods(['isVisibleInCatalog', 'isVisibleInSiteVisibility'])
             ->getMockForAbstractClass();
 
         $this->productRepositoryMock->expects($this->once())
@@ -281,6 +289,10 @@ public function testExecuteWithNoticeAndNoData()
             ->method('isVisibleInCatalog')
             ->willReturn(true);
 
+        $productMock->expects($this->once())
+            ->method('isVisibleInSiteVisibility')
+            ->willReturn(true);
+
         $this->registryMock->expects($this->once())
             ->method('register')
             ->with('product', $productMock, false);
@@ -391,7 +403,7 @@ public function testExecuteWithNonVisibleProduct()
 
         /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
         $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->setMethods(['isVisibleInCatalog'])
+            ->setMethods(['isVisibleInCatalog', 'isVisibleInSiteVisibility'])
             ->getMockForAbstractClass();
 
         $this->productRepositoryMock->expects($this->once())
@@ -403,6 +415,10 @@ public function testExecuteWithNonVisibleProduct()
             ->method('isVisibleInCatalog')
             ->willReturn(false);
 
+        $productMock->expects($this->once())
+            ->method('isVisibleInSiteVisibility')
+            ->willReturn(true);
+
         /** @var \Magento\Framework\Controller\Result\Forward|\PHPUnit_Framework_MockObject_MockObject $forwardMock */
         $forwardMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Forward::class)
             ->disableOriginalConstructor()