MAGETWO-99460: Custom status overrides standard state in dropdowns after being assigned

Author: romadjelf

app/code/Magento/Sales/Model/Order/Config.php

@@ -213,7 +213,7 @@ public function getStates()
     {
         $states = [];
         foreach ($this->_getCollection() as $item) {
-            if ($item->getState()) {
+            if ($item->getState() && $item->getIsDefault()) {
                 $states[$item->getState()] = __($item->getData('label'));
             }
         }

dev/tests/integration/testsuite/Magento/Sales/Model/Order/ConfigTest.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Model\Order;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/**
+ * Test class for \Magento\Sales\Model\Order\Config
+ */
+class ConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var Config
+     */
+    protected $orderConfig;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->orderConfig = $this->objectManager->create(Config::class);
+    }
+
+    /**
+     * Correct display of the list of "Order States" after assigning
+     * the state "complete" to a custom order status.
+     *
+     * @magentoDataFixture Magento/Sales/_files/order_status_assign_state_complete.php
+     */
+    public function testCorrectCompleteStatusInStatesList()
+    {
+        $allStates = $this->orderConfig->getStates();
+        /** @var Status $completeStatus */
+        $completeStatus = $this->objectManager->create(Status::class)
+            ->load(\Magento\Sales\Model\Order::STATE_COMPLETE);
+        $completeState = $allStates[$completeStatus->getStatus()];
+
+        $this->assertEquals($completeStatus->getLabel(), $completeState->getText());
+    }
+}

dev/tests/integration/testsuite/Magento/Sales/_files/order_status_assign_state_complete.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Sales\Model\Order\Status;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var Status $orderStatus */
+$orderStatus = Bootstrap::getObjectManager()->create(Status::class);
+$data = [
+    'status' => 'custom_complete',
+    'label' => 'Custom Complete Status',
+];
+$orderStatus->setData($data)->save();
+$orderStatus->assignState(\Magento\Sales\Model\Order::STATE_COMPLETE, false, true);

dev/tests/integration/testsuite/Magento/Sales/_files/order_status_assign_state_complete_rollback.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Sales\Model\Order\Status;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var Status $orderStatus */
+$orderStatus = Bootstrap::getObjectManager()->create(Status::class);
+$orderStatus->load('custom_complete', 'status');
+$orderStatus->delete();