Merge branch 'MAGETWO-54257' into pr_branch

Author: mslabko

app/code/Magento/ConfigurableProduct/Model/Product/VariationHandler.php

@@ -29,7 +29,10 @@ class VariationHandler
     /** @var \Magento\Catalog\Model\ProductFactory */
     protected $productFactory;
 
-    /** @var \Magento\CatalogInventory\Api\StockConfigurationInterface */
+    /**
+     * @var \Magento\CatalogInventory\Api\StockConfigurationInterface
+     * @deprecated
+     */
     protected $stockConfiguration;
 
     /**
@@ -168,14 +171,10 @@ protected function fillSimpleProductData(
 
         $keysFilter = ['item_id', 'product_id', 'stock_id', 'type_id', 'website_id'];
         $postData['stock_data'] = array_diff_key((array)$parentProduct->getStockData(), array_flip($keysFilter));
-        $postData['stock_data']['manage_stock'] = $postData['quantity_and_stock_status']['qty'] === '' ? 0 : 1;
         if (!isset($postData['stock_data']['is_in_stock'])) {
             $stockStatus = $parentProduct->getQuantityAndStockStatus();
             $postData['stock_data']['is_in_stock'] = $stockStatus['is_in_stock'];
         }
-        $configDefaultValue = $this->stockConfiguration->getManageStock($product->getStoreId());
-        $postData['stock_data']['use_config_manage_stock'] = $postData['stock_data']['manage_stock'] ==
-        $configDefaultValue ? 1 : 0;
         $postData = $this->processMediaGallery($product, $postData);
         $postData['status'] = isset($postData['status'])
             ? $postData['status']

app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/VariationHandlerTest.php

@@ -254,11 +254,6 @@ public function testGenerateSimpleProducts()
         $parentProductMock->expects($this->once())
             ->method('getQuantityAndStockStatus')
             ->willReturn(['is_in_stock' => 1]);
-        $newSimpleProductMock->expects($this->once())->method('getStoreId')->willReturn('store_id');
-        $this->stockConfiguration->expects($this->once())
-            ->method('getManageStock')
-            ->with('store_id')
-            ->willReturn(1);
         $newSimpleProductMock->expects($this->once())->method('addData')->willReturnSelf();
         $parentProductMock->expects($this->once())->method('getWebsiteIds')->willReturn('website_id');
         $newSimpleProductMock->expects($this->once())->method('setWebsiteIds')->with('website_id')->willReturnSelf();

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/VariationHandlerTest.php

@@ -8,37 +8,36 @@
 
 namespace Magento\ConfigurableProduct\Model\Product;
 
+use Magento\TestFramework\Helper\Bootstrap;
+
 /**
  * @magentoAppIsolation enabled
  * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
  */
 class VariationHandlerTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * Object under test
-     *
-     * @var \Magento\ConfigurableProduct\Model\Product\VariationHandler
-     */
-    protected $_model;
+    /** @var \Magento\ConfigurableProduct\Model\Product\VariationHandler */
+    private $_model;
 
-    /**
-     * @var \Magento\Catalog\Model\Product
-     */
-    protected $_product;
+    /** @var \Magento\Catalog\Model\Product */
+    private $_product;
+
+    /** @var \Magento\CatalogInventory\Api\StockRegistryInterface */
+    private $stockRegistry;
 
     protected function setUp()
     {
-        $this->_product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $this->_product = Bootstrap::getObjectManager()->create(
             'Magento\Catalog\Model\Product'
         );
         $this->_product->load(1);
-        // fixture
 
-        $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $this->_model = Bootstrap::getObjectManager()->create(
             'Magento\ConfigurableProduct\Model\Product\VariationHandler'
         );
         // prevent fatal errors by assigning proper "singleton" of type instance to the product
         $this->_product->setTypeInstance($this->_model);
+        $this->stockRegistry = Bootstrap::getObjectManager()->get('Magento\CatalogInventory\Api\StockRegistryInterface');
     }
 
     /**
@@ -52,15 +51,17 @@ public function testGenerateSimpleProducts($productsData)
         $generatedProducts = $this->_model->generateSimpleProducts($this->_product, $productsData);
         $this->assertEquals(3, count($generatedProducts));
         foreach ($generatedProducts as $productId) {
+            $stockItem = $this->stockRegistry->getStockItem($productId);
             /** @var $product \Magento\Catalog\Model\Product */
-            $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            $product = Bootstrap::getObjectManager()->create(
                 'Magento\Catalog\Model\Product'
             );
             $product->load($productId);
             $this->assertNotNull($product->getName());
             $this->assertNotNull($product->getSku());
             $this->assertNotNull($product->getPrice());
             $this->assertNotNull($product->getWeight());
+            $this->assertEquals('1', $stockItem->getIsInStock());
         }
     }
 
@@ -71,14 +72,12 @@ public function testGenerateSimpleProducts($productsData)
      */
     public function testGenerateSimpleProductsWithPartialData($productsData)
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        /** @var \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry */
-        $stockRegistry = $objectManager->get('Magento\CatalogInventory\Api\StockRegistryInterface');
         $this->_product->setNewVariationsAttributeSetId(4);
         $generatedProducts = $this->_model->generateSimpleProducts($this->_product, $productsData);
+        $parentStockItem = $this->stockRegistry->getStockItem($this->_product->getId());
         foreach ($generatedProducts as $productId) {
-            $stockItem = $stockRegistry->getStockItem($productId);
-            $this->assertEquals('0', $stockItem->getManageStock());
+            $stockItem = $this->stockRegistry->getStockItem($productId);
+            $this->assertEquals($parentStockItem->getManageStock(), $stockItem->getManageStock());
             $this->assertEquals('1', $stockItem->getIsInStock());
         }
     }