Skip to content

[Backport] Fix issue #13010. Check if product is assigned to current website #14673

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
Apr 16, 2018
Merged

[Backport] Fix issue #13010. Check if product is assigned to current website #14673

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
5 changes: 5 additions & 0 deletions app/code/Magento/Review/Controller/Product.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,11 @@ protected function loadProduct($productId)

try {
$product = $this->productRepository->getById($productId);

if (!in_array($this->storeManager->getStore()->getWebsiteId(), $product->getWebsiteIds())) {
throw new NoSuchEntityException();
}

if (!$product->isVisibleInCatalog() || !$product->isVisibleInSiteVisibility()) {
throw new NoSuchEntityException();
}
Expand Down
16 changes: 14 additions & 2 deletions app/code/Magento/Review/Test/Unit/Controller/Product/PostTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,13 @@ protected function setUp()
$ratingFactory->expects($this->once())->method('create')->willReturn($this->rating);
$this->messageManager = $this->getMock('\Magento\Framework\Message\ManagerInterface');

$this->store = $this->getMock('\Magento\Store\Model\Store', ['getId'], [], '', false);
$this->store = $this->getMock(
'\Magento\Store\Model\Store',
['getId', 'getWebsiteId'],
[],
'',
false
);
$storeManager = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
$storeManager->expects($this->any())->method('getStore')->willReturn($this->store);

Expand Down Expand Up @@ -242,7 +248,7 @@ public function testExecute()
->willReturn(1);
$product = $this->getMock(
'Magento\Catalog\Model\Product',
['__wakeup', 'isVisibleInCatalog', 'isVisibleInSiteVisibility', 'getId'],
['__wakeup', 'isVisibleInCatalog', 'isVisibleInSiteVisibility', 'getId', 'getWebsiteIds'],
[],
'',
false
Expand All @@ -253,6 +259,10 @@ public function testExecute()
$product->expects($this->once())
->method('isVisibleInSiteVisibility')
->willReturn(true);
$product->expects($this->once())
->method('getWebsiteIds')
->willReturn([1]);

$this->productRepository->expects($this->any())->method('getById')
->with(1)
->willReturn($product);
Expand Down Expand Up @@ -288,6 +298,8 @@ public function testExecute()
$this->review->expects($this->once())->method('setCustomerId')->with($customerId)->willReturnSelf();
$this->store->expects($this->exactly(2))->method('getId')
->willReturn($storeId);
$this->store->expects($this->once())->method('getWebsiteId')
->willReturn(1);
$this->review->expects($this->once())->method('setStoreId')
->with($storeId)
->willReturnSelf();
Expand Down