Skip to content

magento/magento2#7720 #26470

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
merged 11 commits into from
Sep 18, 2020
Merged

magento/magento2#7720 #26470

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
042df41
#7720
Jan 21, 2020
a039ff4
7720
Jan 21, 2020
13af48a
#7720 fix cs
Jan 27, 2020
a5d7355
Merge remote-tracking branch 'engcom-Charlie/7720' into 7720
engcom-Charlie Jan 27, 2020
8c8949d
Merge branch '2.4-develop' into 7720
slavvka Feb 7, 2020
2c15517
Merge remote-tracking branch 'engcom-Charlie/7720' into 7720
engcom-Charlie Feb 10, 2020
156b3c2
magento/magento2#7720: fix integration test
engcom-Charlie Feb 10, 2020
347001f
Merge branch '2.4-develop' into 7720
engcom-Charlie Feb 10, 2020
28b5d9d
magento/magento2#7720: improve integration test fix
engcom-Charlie Feb 10, 2020
a892a19
Merge branch '2.4-develop' into 7720
engcom-Charlie Aug 20, 2020
9b9d123
improve test
engcom-Charlie Aug 20, 2020
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
4 changes: 3 additions & 1 deletion app/code/Magento/Catalog/Model/ProductRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,9 @@ public function save(ProductInterface $product, $saveOptions = false)
if (!$ignoreLinksFlag && $ignoreLinksFlag !== null) {
$productLinks = $product->getProductLinks();
}
$productDataArray['store_id'] = (int)$this->storeManager->getStore()->getId();
if (!isset($productDataArray['store_id'])) {
$productDataArray['store_id'] = (int) $this->storeManager->getStore()->getId();
}
$product = $this->initializeProductData($productDataArray, empty($existingProduct));

$this->processLinks($product, $productLinks);
Expand Down
20 changes: 20 additions & 0 deletions dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,4 +233,24 @@ public function testCustomLayout(): void
}
$this->assertTrue($caughtException);
}

/**
* Tests product repository update should use provided store code.
*
* @magentoDataFixture Magento/Catalog/_files/product_simple.php
*/
public function testProductUpdate(): void
{
$sku = 'simple';
$nameUpdated = 'updated';

$product = $this->productRepository->get($sku, false, 0);
$product->setName($nameUpdated);
$this->productRepository->save($product);
$product = $this->productRepository->get($sku, false, 0);
self::assertEquals(
$nameUpdated,
$product->getName()
);
}
}