Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
magento-engcom-team merged 1 commit into from
Jun 13, 2019
+21 −5
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/SendFriend/Controller/Product.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
24 changes: 20 additions & 4 deletions app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand All @@ -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);
Expand Down Expand Up @@ -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())
Expand All @@ -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);
Expand Down Expand Up @@ -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())
Expand All @@ -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);
Expand Down Expand Up @@ -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())
Expand All @@ -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()
Expand Down