MAGETWO-98013: [2.3] Configurable product is displayed as In Stock in product grid when it's set to out of stock

Author: yelahin-serhiy

app/code/Magento/CatalogInventory/Ui/DataProvider/Product/AddIsInStockFieldToCollection.php renamed to app/code/Magento/CatalogInventory/Ui/DataProvider/Product/AddQuantityAndStockStatusFieldToCollection.php

@@ -11,9 +11,9 @@
 use Magento\Ui\DataProvider\AddFieldToCollectionInterface;
 
 /**
- * Add is_in_stock field to collection
+ * Add quantity_and_stock_status field to collection
  */
-class AddIsInStockFieldToCollection implements AddFieldToCollectionInterface
+class AddQuantityAndStockStatusFieldToCollection implements AddFieldToCollectionInterface
 {
     /**
      * @inheritdoc

app/code/Magento/CatalogInventory/etc/adminhtml/di.xml

@@ -23,7 +23,7 @@
         <arguments>
             <argument name="addFieldStrategies" xsi:type="array">
                 <item name="qty" xsi:type="object">Magento\CatalogInventory\Ui\DataProvider\Product\AddQuantityFieldToCollection</item>
-                <item name="quantity_and_stock_status" xsi:type="object">Magento\CatalogInventory\Ui\DataProvider\Product\AddIsInStockFieldToCollection</item>
+                <item name="quantity_and_stock_status" xsi:type="object">Magento\CatalogInventory\Ui\DataProvider\Product\AddQuantityAndStockStatusFieldToCollection</item>
             </argument>
             <argument name="addFilterStrategies" xsi:type="array">
                 <item name="qty" xsi:type="object">Magento\CatalogInventory\Ui\DataProvider\Product\AddQuantityFilterToCollection</item>

dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/QuantityAndStockStatusTest.php

@@ -9,9 +9,11 @@
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\CatalogInventory\Model\Stock\StockItemRepository;
-use Magento\CatalogInventory\Ui\DataProvider\Product\AddIsInStockFieldToCollection;
+use Magento\CatalogInventory\Ui\DataProvider\Product\AddQuantityAndStockStatusFieldToCollection;
 use PHPUnit\Framework\TestCase;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\CatalogInventory\Api\StockItemCriteriaInterface;
+use Magento\CatalogInventory\Api\StockRegistryInterface;
 
 /**
  * Quantity and stock status test
@@ -44,19 +46,16 @@ protected function setUp()
      */
     public function testProductStockStatus()
     {
-        /** @var ProductRepositoryInterface $productRepository */
-        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-        $product = $productRepository->get('simple');
-        $productId = $product->getId();
-
         /** @var StockItemRepository $stockItemRepository */
         $stockItemRepository = $this->objectManager->create(StockItemRepository::class);
 
-        $stockItem = $stockItemRepository->get($productId);
+        /** @var StockRegistryInterface $stockRegistry */
+        $stockRegistry = $this->objectManager->create(StockRegistryInterface::class);
+
+        $stockItem = $stockRegistry->getStockItemBySku('simple');
         $stockItem->setIsInStock(false);
         $stockItemRepository->save($stockItem);
-        $savedStockItem = $stockItemRepository->get($productId);
-        $savedStockStatus = $savedStockItem->getData('is_in_stock');
+        $savedStockStatus = (int)$stockItem->getIsInStock();
 
         $dataProvider = $this->objectManager->create(
             ProductDataProvider::class,
@@ -66,7 +65,7 @@ public function testProductStockStatus()
                 'requestFieldName' => 'id',
                 'addFieldStrategies' => [
                     'quantity_and_stock_status' =>
-                        $this->objectManager->get(AddIsInStockFieldToCollection::class)
+                        $this->objectManager->get(AddQuantityAndStockStatusFieldToCollection::class)
                 ]
             ]
         );