Skip to content

Commit 461c135

Browse files
committed
Revert "MAGETWO-37729: Stock is not updated when Stock indexer is in Update on Schedule mode"
This reverts commit e39d12c. Conflicts: dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Stock/ItemTest.php
1 parent 3a8d8b2 commit 461c135

File tree

3 files changed

+5
-43
lines changed
  • app/code/Magento
  • dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Stock

3 files changed

+5
-43
lines changed

app/code/Magento/CatalogInventory/Model/Resource/Stock/Item.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ protected function _afterSave(AbstractModel $object)
123123
parent::_afterSave($object);
124124
/** @var StockItemInterface $object */
125125
if ($this->processIndexEvents) {
126-
$this->stockIndexerProcessor->markIndexerAsInvalid();
127126
$this->stockIndexerProcessor->reindexRow($object->getProductId());
128127
}
129128
return $this;

app/code/Magento/Indexer/etc/crontab.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../Cron/etc/crontab.xsd">
9-
<group id="default">
9+
<group id="index">
1010
<job name="indexer_reindex_all_invalid" instance="Magento\Indexer\Model\Processor" method="reindexAllInvalid">
1111
<schedule>* * * * *</schedule>
1212
</job>

dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Stock/ItemTest.php

Lines changed: 4 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
*/
66
namespace Magento\CatalogInventory\Model\Stock;
77

8-
use Magento\Indexer\Model\Indexer\State;
9-
108
class ItemTest extends \PHPUnit_Framework_TestCase
119
{
1210
/**
@@ -23,7 +21,6 @@ protected function setUp()
2321

2422
/**
2523
* @magentoDataFixture Magento/Catalog/_files/products.php
26-
* @magentoAppIsolation enabled
2724
*/
2825
public function testSaveWithNullQty()
2926
{
@@ -34,11 +31,11 @@ public function testSaveWithNullQty()
3431
$product->load(1);
3532

3633
/** @var \Magento\CatalogInventory\Model\Stock\StockItemRepository $stockItemRepository */
37-
$stockItemRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
34+
$stockItemRepository = $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
3835
->create('Magento\CatalogInventory\Model\Stock\StockItemRepository');
3936

4037
/** @var \Magento\CatalogInventory\Api\StockItemCriteriaInterface $stockItemCriteria */
41-
$stockItemCriteria = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
38+
$stockItemCriteria = $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
4239
->create('Magento\CatalogInventory\Api\StockItemCriteriaInterface');
4340

4441
$savedStockItem = current($stockItemRepository->getList($stockItemCriteria)->getItems());
@@ -63,49 +60,15 @@ public function testSaveWithNullQty()
6360

6461
/**
6562
* @magentoDataFixture Magento/Catalog/_files/products.php
66-
* @magentoAppIsolation enabled
67-
*/
68-
public function testIndexerInvalidation()
69-
{
70-
/** @var \Magento\CatalogInventory\Model\Stock\StockItemRepository $stockItemRepository */
71-
$stockItemRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
72-
->create('Magento\CatalogInventory\Model\Stock\StockItemRepository');
73-
74-
/** @var \Magento\CatalogInventory\Api\StockItemCriteriaInterface $stockItemCriteria */
75-
$stockItemCriteria = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
76-
->create('Magento\CatalogInventory\Api\StockItemCriteriaInterface');
77-
/** @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor $indexerProcessor */
78-
$indexerProcessor = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
79-
->create('Magento\CatalogInventory\Model\Indexer\Stock\Processor');
80-
$indexer = $indexerProcessor->getIndexer();
81-
$indexer->setScheduled(true);
82-
$indexer->getState()->setStatus(State::STATUS_VALID)->save();
83-
84-
/** @var \Magento\CatalogInventory\Api\Data\StockItemInterface $savedStockItem */
85-
$savedStockItem = current($stockItemRepository->getList($stockItemCriteria)->getItems());
86-
$savedStockItem->setQty(1);
87-
$savedStockItem->setIsInStock(false);
88-
$savedStockItem->save();
89-
90-
91-
$this->assertEquals('invalid', $indexerProcessor->getIndexer()->getStatus());
92-
93-
$indexer->setScheduled(false);
94-
$indexer->getState()->setStatus(State::STATUS_VALID)->save();
95-
}
96-
97-
/**
98-
* @magentoDataFixture Magento/Catalog/_files/products.php
99-
* @magentoAppIsolation enabled
10063
*/
10164
public function testStockStatusChangedAuto()
10265
{
10366
/** @var \Magento\CatalogInventory\Model\Stock\StockItemRepository $stockItemRepository */
104-
$stockItemRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
67+
$stockItemRepository = $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
10568
->create('Magento\CatalogInventory\Model\Stock\StockItemRepository');
10669

10770
/** @var \Magento\CatalogInventory\Api\StockItemCriteriaInterface $stockItemCriteria */
108-
$stockItemCriteria = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
71+
$stockItemCriteria = $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
10972
->create('Magento\CatalogInventory\Api\StockItemCriteriaInterface');
11073

11174
$savedStockItem = current($stockItemRepository->getList($stockItemCriteria)->getItems());

0 commit comments

Comments
 (0)