Merge branch 'MC-35930' of https://github.com/magento-chaika/magento2ce into TANGO-PR-07-29-2020_23

Author: Roman Lytvynenko

app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php

@@ -10,6 +10,8 @@
 
 /**
  * Class AddComment
+ *
+ * Controller responsible for addition of the order comment to the order
  */
 class AddComment extends \Magento\Sales\Controller\Adminhtml\Order implements HttpPostActionInterface
 {
@@ -42,6 +44,7 @@ public function execute()
                     );
                 }
 
+                $order->setStatus($data['status']);
                 $notify = $data['is_customer_notified'] ?? false;
                 $visible = $data['is_visible_on_front'] ?? false;
 

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

@@ -52,7 +52,7 @@ class Config
      */
     protected $maskStatusesMapping = [
         \Magento\Framework\App\Area::AREA_FRONTEND => [
-            \Magento\Sales\Model\Order::STATUS_FRAUD => \Magento\Sales\Model\Order::STATE_PROCESSING,
+            \Magento\Sales\Model\Order::STATUS_FRAUD => \Magento\Sales\Model\Order::STATUS_FRAUD,
             \Magento\Sales\Model\Order::STATE_PAYMENT_REVIEW => \Magento\Sales\Model\Order::STATE_PROCESSING
         ]
     ];

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

@@ -50,4 +50,28 @@ public function testCorrectCompleteStatusInStatesList()
 
         $this->assertEquals($completeStatus->getLabel(), $completeState->getText());
     }
+
+    /**
+     * Test Mask Status For Area
+     *
+     * @param string $code
+     * @param string $expected
+     * @dataProvider dataProviderForTestMaskStatusForArea
+     */
+    public function testMaskStatusForArea(string $code, string $expected)
+    {
+        $result = $this->orderConfig->getStatusFrontendLabel($code);
+        $this->assertEquals($expected, $result);
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderForTestMaskStatusForArea()
+    {
+        return [
+            ['fraud', 'Suspected Fraud'],
+            ['processing', 'Processing'],
+        ];
+    }
 }