Merge remote-tracking branch 'origin/develop' into MAGETWO-38946

Author: Alex Bomko

app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/StockItemRepositoryTest.php

@@ -118,11 +118,13 @@ protected function setUp()
         $this->stockItemFactoryMock = $this->getMockBuilder(
             'Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory'
         )
+            ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->stockItemCollectionMock = $this->getMockBuilder(
             'Magento\CatalogInventory\Api\Data\StockItemCollectionInterfaceFactory'
         )
+            ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->productFactoryMock = $this->getMockBuilder('Magento\Catalog\Model\ProductFactory')
@@ -138,6 +140,7 @@ protected function setUp()
             ->willReturn($this->productMock);
 
         $this->queryBuilderFactoryMock = $this->getMockBuilder('Magento\Framework\DB\QueryBuilderFactory')
+            ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->mapperMock = $this->getMockBuilder('Magento\Framework\DB\MapperFactory')

app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/StockStatusRepositoryTest.php

@@ -59,14 +59,17 @@ protected function setUp()
         $this->stockStatusFactoryMock = $this->getMockBuilder(
             'Magento\CatalogInventory\Model\Stock\StatusFactory'
         )
+            ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->stockStatusCollectionMock = $this->getMockBuilder(
             'Magento\CatalogInventory\Api\Data\StockStatusCollectionInterfaceFactory'
         )
+            ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->queryBuilderFactoryMock = $this->getMockBuilder('Magento\Framework\DB\QueryBuilderFactory')
+            ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->mapperMock = $this->getMockBuilder('Magento\Framework\DB\MapperFactory')

app/code/Magento/CatalogInventory/Test/Unit/Model/StockRegistryTest.php

@@ -27,6 +27,7 @@ public function setUp()
             ->getMock();
 
         $criteriaFactory = $this->getMockBuilder('Magento\CatalogInventory\Api\StockItemCriteriaInterfaceFactory')
+            ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
         $criteriaFactory->expects($this->once())->method('create')->willReturn($this->criteria);