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

Author: Leonid Poluyanov

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

@@ -60,15 +60,18 @@ protected function setUp()
         $this->stockFactoryMock = $this->getMockBuilder(
             'Magento\CatalogInventory\Model\StockFactory'
         )
+            ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->stockCollectionMock = $this->getMockBuilder(
             'Magento\CatalogInventory\Api\Data\StockCollectionInterfaceFactory'
         )
+            ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->queryBuilderFactoryMock = $this->getMockBuilder('Magento\Framework\DB\QueryBuilderFactory')
+            ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->mapperMock = $this->getMockBuilder('Magento\Framework\DB\MapperFactory')