788: Integration test rework. Shipment controller refactor.

Author: nmalevanec

app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewAction.php

@@ -53,7 +53,7 @@ public function execute()
     {
         $this->shipmentLoader->setOrderId($this->getRequest()->getParam('order_id'));
         $this->shipmentLoader->setShipmentId($this->getRequest()->getParam('shipment_id'));
-        $this->shipmentLoader->setShipment($this->shipmentProvider->getShipment());
+        $this->shipmentLoader->setShipment($this->shipmentProvider->getShipmentData());
         $this->shipmentLoader->setTracking($this->getRequest()->getParam('tracking'));
         $shipment = $this->shipmentLoader->load();
         if ($shipment) {

app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/NewActionTest.php

@@ -135,7 +135,7 @@ protected function setUp()
         );
         $this->shipmentProviderMock = $this->getMockBuilder(\Magento\Shipping\Model\ShipmentProviderInterface::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getShipment'])
+            ->setMethods(['getShipmentData'])
             ->getMockForAbstractClass();
         $this->actionFlag = $this->createPartialMock(\Magento\Framework\App\ActionFlag::class, ['get']);
         $this->helper = $this->createPartialMock(\Magento\Backend\Helper\Data::class, ['getUrl']);
@@ -270,7 +270,7 @@ public function testExecute()
             ->with('menu')
             ->will($this->returnValue($menuBlock));
         $this->shipmentProviderMock->expects($this->once())
-            ->method('getShipment')
+            ->method('getShipmentData')
             ->willReturn($shipmentData);
 
         $this->assertNull($this->newAction->execute());