Fix issue related with UnitTest

magento · Jan 29, 2020 · 1000bcd · 1000bcd
1 parent 4e94687
commit 1000bcd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/app/code/Magento/Sales/Block/Status/Grid/Column/State.php b/app/code/Magento/Sales/Block/Status/Grid/Column/State.php
@@ -57,10 +57,12 @@ public function decorateState($value, $row, $column, $isExport)
     {
         $states = $this->_config->getStates();
         if (isset($states[$value])) {
-            $cell = $value . '[' . $states[$value] . ']';
-        } else {
-            $cell = $value;
+            return sprintf("%s[%s]",
+                $value,
+                $states[$value]
+            );
         }
-        return $cell;
+
+        return $value;
     }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Status/Grid/Column/StateTest.php b/app/code/Magento/Sales/Test/Unit/Block/Status/Grid/Column/StateTest.php
@@ -55,13 +55,15 @@ public function testDecorateState()
                 [
                     'status' => 'fraud',
                     'state' => 'processing',
+                    'is_default' => '0',
                     'label' => 'Suspected Fraud',
                 ]
             ),
             new \Magento\Framework\DataObject(
                 [
                     'status' => 'processing',
                     'state' => 'processing',
+                    'is_default' => '1',
                     'label' => 'Processing',
                 ]
             )
@@ -78,6 +80,6 @@ public function testDecorateState()
             ->will($this->returnValue($statuses));
 
         $result = $this->stateColumn->decorateState('processing', $rowMock, $columnMock, false);
-        $this->assertSame('processing[Suspected Fraud]', $result);
+        $this->assertSame('processing[Processing]', $result);
     }
 }