MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart

Author: vzabaznov

app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/QuantityValidatorTest.php

@@ -6,6 +6,8 @@
 
 namespace Magento\CatalogInventory\Test\Unit\Model\Quote\Item\QuantityValidator\Initializer;
 
+use Magento\CatalogInventory\Api\Data\StockStatusInterface;
+use Magento\CatalogInventory\Model\Stock\Status;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\CatalogInventory\Model\StockRegistry;
 use Magento\CatalogInventory\Model\Quote\Item\QuantityValidator\Initializer\Option;
@@ -112,10 +114,25 @@ class QuantityValidatorTest extends \PHPUnit_Framework_TestCase
      */
     private $stockItemInitializer;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|StockStatusInterface
+     */
+    private $stockStatusMock;
+
     protected function setUp()
     {
         $objectManagerHelper = new ObjectManager($this);
-        $this->stockRegistryMock = $this->getMock(StockRegistry::class, ['getStockItem'], [], '', false);
+
+        $this->stockRegistryMock = $this->getMock(
+            StockRegistry::class,
+            [],
+            [],
+            '',
+            false
+        );
+
+        $this->stockStatusMock = $this->getMock(Status::class, [], [], '', false);
+
         $this->optionInitializer = $this->getMock(Option::class, [], [], '', false);
         $this->stockItemInitializer = $this->getMock(StockItem::class, [], [], '', false);
         $this->stockState = $this->getMock(StockState::class, [], [], '', false);
@@ -149,8 +166,10 @@ protected function setUp()
         );
         $this->productMock = $this->getMock(Product::class, [], [], '', false);
         $this->stockItemMock = $this->getMock(StockMock::class, [], [], '', false);
-        $this->parentStockItemMock = $this->getMock(StockMock::class, [], [], '', false);
+        $this->parentStockItemMock = $this->getMock(StockMock::class, ['getStockStatus'], [], '', false);
+
         $this->typeInstanceMock = $this->getMock(Type::class, [], [], '', false);
+
         $this->resultMock = $this->getMock(
             DataObject::class,
             ['checkQtyIncrements', 'getMessage', 'getQuoteMessage', 'getHasError'],
@@ -171,9 +190,11 @@ public function testValidateOutOfStock()
         $this->stockRegistryMock->expects($this->at(0))
             ->method('getStockItem')
             ->willReturn($this->stockItemMock);
-        $this->stockItemMock->expects($this->once())
-            ->method('getIsInStock')
-            ->willReturn(false);
+
+        $this->stockRegistryMock->expects($this->atLeastOnce())
+            ->method('getStockStatus')
+            ->willReturn($this->stockStatusMock);
+
         $this->quoteItemMock->expects($this->once())
             ->method('addErrorInfo')
             ->with(
@@ -203,21 +224,27 @@ public function testValidateInStock()
         $this->stockRegistryMock->expects($this->at(0))
             ->method('getStockItem')
             ->willReturn($this->stockItemMock);
+
         $this->stockRegistryMock->expects($this->at(1))
-            ->method('getStockItem')
-            ->willReturn($this->parentStockItemMock);
-        $this->parentStockItemMock->expects($this->once())
-            ->method('getIsInStock')
-            ->willReturn(false);
+            ->method('getStockStatus')
+            ->willReturn($this->stockStatusMock);
+
         $this->quoteItemMock->expects($this->any())
             ->method('getParentItem')
             ->willReturn($this->parentItemMock);
-        $this->stockItemMock->expects($this->once())
-            ->method('getIsInStock')
+
+        $this->stockRegistryMock->expects($this->at(2))
+            ->method('getStockStatus')
+            ->willReturn($this->parentStockItemMock);
+
+        $this->parentStockItemMock->expects($this->once())
+            ->method('getStockStatus')
+            ->willReturn(false);
+
+        $this->stockStatusMock->expects($this->atLeastOnce())
+            ->method('getStockStatus')
             ->willReturn(true);
-        $this->stockRegistryMock->expects($this->at(0))
-            ->method('getStockItem')
-            ->willReturn($this->stockItemMock);
+
         $this->quoteItemMock->expects($this->once())
             ->method('addErrorInfo')
             ->with(
@@ -250,15 +277,18 @@ public function testValidateWithOptions()
         $this->stockRegistryMock->expects($this->at(0))
             ->method('getStockItem')
             ->willReturn($this->stockItemMock);
+        $this->stockRegistryMock->expects($this->at(1))
+            ->method('getStockStatus')
+            ->willReturn($this->stockStatusMock);
         $options = [$optionMock];
         $this->createInitialStub(1);
         $this->setUpStubForQuantity(1, true);
         $this->setUpStubForRemoveError();
         $this->parentStockItemMock->expects($this->any())
-            ->method('getIsInStock')
+            ->method('getStockStatus')
             ->willReturn(true);
-        $this->stockItemMock->expects($this->once())
-            ->method('getIsInStock')
+        $this->stockStatusMock->expects($this->once())
+            ->method('getStockStatus')
             ->willReturn(true);
         $this->quoteItemMock->expects($this->any())
             ->method('getQtyOptions')
@@ -285,15 +315,18 @@ public function testValidateWithOptionsAndError()
         $this->stockRegistryMock->expects($this->at(0))
             ->method('getStockItem')
             ->willReturn($this->stockItemMock);
+        $this->stockRegistryMock->expects($this->at(1))
+            ->method('getStockStatus')
+            ->willReturn($this->stockStatusMock);
         $options = [$optionMock];
         $this->createInitialStub(1);
         $this->setUpStubForQuantity(1, true);
         $this->setUpStubForRemoveError();
         $this->parentStockItemMock->expects($this->any())
-            ->method('getIsInStock')
+            ->method('getStockStatus')
             ->willReturn(true);
-        $this->stockItemMock->expects($this->once())
-            ->method('getIsInStock')
+        $this->stockStatusMock->expects($this->once())
+            ->method('getStockStatus')
             ->willReturn(true);
         $this->quoteItemMock->expects($this->any())
             ->method('getQtyOptions')
@@ -321,11 +354,14 @@ public function testRemoveError()
         $this->stockRegistryMock->expects($this->at(0))
             ->method('getStockItem')
             ->willReturn($this->stockItemMock);
+        $this->stockRegistryMock->expects($this->at(1))
+            ->method('getStockStatus')
+            ->willReturn($this->stockStatusMock);
         $this->quoteItemMock->expects($this->any())
             ->method('getParentItem')
             ->willReturn($this->parentItemMock);
-        $this->stockItemMock->expects($this->once())
-            ->method('getIsInStock')
+        $this->stockStatusMock->expects($this->once())
+            ->method('getStockStatus')
             ->willReturn(true);
         $this->quoteItemMock->expects($this->never())
             ->method('addErrorInfo');