MAGETWO-53574: Merge pull request with regression bugfixes

Author: mlogvin

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php

@@ -196,16 +196,6 @@ protected function setUp()
      */
     public function testInitialize()
     {
-        $this->websiteMock->expects($this->once())
-            ->method('getId')
-            ->willReturn($this->websiteId);
-        $this->storeMock->expects($this->once())
-            ->method('getWebsite')
-            ->willReturn($this->websiteMock);
-        $this->storeManagerMock->expects($this->once())
-            ->method('getStore')
-            ->with(true)
-            ->willReturn($this->storeMock);
         $this->customOptionMock->expects($this->once())
             ->method('setProductSku');
         $this->customOptionMock->expects($this->once())
@@ -270,9 +260,6 @@ public function testInitialize()
             ->method('filter')
             ->with(['stock_data'])
             ->willReturn(['stock_data']);
-        $this->storeManagerMock->expects($this->once())
-            ->method('hasSingleStore')
-            ->willReturn(true);
         $this->productMock->expects($this->once())
             ->method('isLockedAttribute')
             ->with('media')
@@ -300,9 +287,6 @@ public function testInitialize()
         $this->productMock->expects($this->once())
             ->method('getSku')
             ->willReturn('sku');
-        $this->productMock->expects($this->once())
-            ->method('setWebsiteIds')
-            ->with([$this->websiteId]);
         $this->productMock->expects($this->any())
             ->method('getOptionsReadOnly')
             ->willReturn(false);