Merge pull request #214 from magento-sparta/MDVA-3

[SUPPORT] MDVA-3
magento · Nov 27, 2015 · 48de512 · 48de512
2 parents 2b9aecb + f2f39af
commit 48de512
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php b/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
@@ -148,7 +148,6 @@ public function getStockItem($productId, $websiteId)
         if (!isset($this->stockItems[$key])) {
             $criteria = $this->stockItemCriteriaFactory->create();
             $criteria->setProductsFilter($productId);
-            $criteria->setWebsiteFilter($websiteId);
             $collection = $this->stockItemRepository->getList($criteria);
             $stockItem = current($collection->getItems());
             if ($stockItem && $stockItem->getItemId()) {

diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Spi/StockRegistryProviderTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Spi/StockRegistryProviderTest.php
@@ -253,7 +253,6 @@ public function testGetStock()
     public function testGetStockItem()
     {
         $this->stockItemCriteriaFactory->expects($this->once())->method('create')->willReturn($this->stockItemCriteria);
-        $this->stockItemCriteria->expects($this->once())->method('setWebsiteFilter')->willReturn(null);
         $this->stockItemCriteria->expects($this->once())->method('setProductsFilter')->willReturn(null);
         $stockItemCollection = $this->getMock(
             '\Magento\CatalogInventory\Model\Resource\Stock\Item\Collection',