Merge branch 'MC-37539' of https://github.com/magento-mpi/magento2ce into PR-09-24-2020

Author: chittima

app/code/Magento/Sales/Model/ShipOrder.php

@@ -177,11 +177,13 @@ public function execute(
         $connection->beginTransaction();
         try {
             $this->orderRegistrar->register($order, $shipment);
-            $order->setState(
-                $this->orderStateResolver->getStateForOrder($order, [OrderStateResolverInterface::IN_PROGRESS])
-            );
-            $order->setStatus($this->config->getStateDefaultStatus($order->getState()));
-            $shippingData = $this->shipmentRepository->save($shipment);
+            $shipment = $this->shipmentRepository->save($shipment);
+            if ($order->getState() === Order::STATE_NEW) {
+                $order->setState(
+                    $this->orderStateResolver->getStateForOrder($order, [OrderStateResolverInterface::IN_PROGRESS])
+                );
+                $order->setStatus($this->config->getStateDefaultStatus($order->getState()));
+            }
             $this->orderRepository->save($order);
             $connection->commit();
         } catch (\Exception $e) {
@@ -191,9 +193,7 @@ public function execute(
                 __('Could not save a shipment, see error log for details')
             );
         }
-        if ($shipment && empty($shipment->getEntityId())) {
-            $shipment->setEntityId($shippingData->getEntityId());
-        }
+
         if ($notify) {
             if (!$appendComment) {
                 $comment = null;

app/code/Magento/Sales/Test/Unit/Model/ShipOrderTest.php

@@ -270,12 +270,12 @@ public function testExecute($orderId, $items, $notify, $appendComment)
             ->method('setState')
             ->with(Order::STATE_PROCESSING)
             ->willReturnSelf();
-        $this->orderMock->expects($this->once())
+        $this->orderMock->expects($this->exactly(2))
             ->method('getState')
-            ->willReturn(Order::STATE_PROCESSING);
+            ->willReturn(Order::STATE_NEW);
         $this->configMock->expects($this->once())
             ->method('getStateDefaultStatus')
-            ->with(Order::STATE_PROCESSING)
+            ->with(Order::STATE_NEW)
             ->willReturn('Processing');
         $this->orderMock->expects($this->once())
             ->method('setStatus')
@@ -294,7 +294,7 @@ public function testExecute($orderId, $items, $notify, $appendComment)
                 ->method('notify')
                 ->with($this->orderMock, $this->shipmentMock, $this->shipmentCommentCreationMock);
         }
-        $this->shipmentMock->expects($this->exactly(2))
+        $this->shipmentMock->expects($this->exactly(1))
             ->method('getEntityId')
             ->willReturn(2);
         $this->assertEquals(

dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipOrderTest.php

@@ -62,6 +62,7 @@ public function testConfigurableShipOrder()
         $shipmentId = (int)$this->_webApiCall($this->getServiceInfo($existingOrder), $requestData);
         $this->assertNotEmpty($shipmentId);
 
+        $shipment = null;
         try {
             $shipment = $this->shipmentRepository->get($shipmentId);
         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
@@ -89,6 +90,42 @@ public function testConfigurableShipOrder()
         );
     }
 
+    /**
+     * Tests that order doesn't change a status from custom to the default after shipment creation.
+     *
+     * @magentoApiDataFixture Magento/Sales/_files/order_status.php
+     */
+    public function testShipOrderStatusPreserve()
+    {
+        $incrementId = '100000001';
+        $orderStatus = 'example';
+
+        /** @var Order $existingOrder */
+        $order = $this->getOrder($incrementId);
+        $this->assertEquals($orderStatus, $order->getStatus());
+
+        $requestData = [
+            'orderId' => $order->getId()
+        ];
+        /** @var OrderItemInterface $item */
+        foreach ($order->getAllItems() as $item) {
+            $requestData['items'][] = [
+                'order_item_id' => $item->getItemId(),
+                'qty' => $item->getQtyOrdered(),
+            ];
+        }
+
+        $shipmentId = $this->_webApiCall($this->getServiceInfo($order), $requestData);
+        $this->assertNotEmpty($shipmentId);
+        $actualOrder = $this->getOrder($order->getIncrementId());
+
+        $this->assertEquals(
+            $order->getStatus(),
+            $actualOrder->getStatus(),
+            'Failed asserting that Order status wasn\'t changed'
+        );
+    }
+
     /**
      * @magentoApiDataFixture Magento/Sales/_files/order_new.php
      */
@@ -214,6 +251,7 @@ public function testPartialShipOrderWithBundleShippedSeparately()
         $shipmentId = $this->_webApiCall($this->getServiceInfo($existingOrder), $requestData);
         $this->assertNotEmpty($shipmentId);
 
+        $shipment = null;
         try {
             $shipment = $this->shipmentRepository->get($shipmentId);
         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
@@ -268,6 +306,7 @@ public function testPartialShipOrderWithTwoBundleShippedSeparatelyContainsSameSi
         $shipmentId = $this->_webApiCall($this->getServiceInfo($order), $requestData);
         $this->assertNotEmpty($shipmentId);
 
+        $shipment = null;
         try {
             $shipment = $this->shipmentRepository->get($shipmentId);
         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {