Merge remote-tracking branch 'origin/MAGETWO-96949' into 2.1.18-develop-pr66

Author: StasKozar

app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/Status/OptionsTest.php

@@ -10,7 +10,7 @@
 use Magento\Sales\Ui\Component\Listing\Column\Status\Options;
 
 /**
- * Class OptionsTest
+ * Class OptionsTest for Magento\Sales\Ui\Component\Listing\Column\Status\Options.
  */
 class OptionsTest extends \PHPUnit_Framework_TestCase
 {
@@ -24,35 +24,62 @@ class OptionsTest extends \PHPUnit_Framework_TestCase
      */
     protected $collectionFactoryMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
         $this->collectionFactoryMock = $this->getMock(
-            'Magento\Sales\Model\ResourceModel\Order\Status\CollectionFactory',
+            \Magento\Sales\Model\ResourceModel\Order\Status\CollectionFactory::class,
             ['create'],
             [],
             '',
             false
         );
         $this->model = $objectManager->getObject(
-            'Magento\Sales\Ui\Component\Listing\Column\Status\Options',
+            \Magento\Sales\Ui\Component\Listing\Column\Status\Options::class,
             ['collectionFactory' => $this->collectionFactoryMock]
         );
     }
 
+    /**
+     * Unit test for toOptionArray method.
+     *
+     * @return void
+     */
     public function testToOptionArray()
     {
-        $collectionMock =
-            $this->getMock('Magento\Sales\Model\ResourceModel\Order\Status\Collection', [], [], '', false);
-        $options = ['options'];
+        $collectionMock = $this->getMock(
+            \Magento\Sales\Model\ResourceModel\Order\Status\Collection::class,
+            [],
+            [],
+            '',
+            false
+        );
+
+        $options = [
+            [
+                'value' => '1',
+                'label' => 'Label',
+            ],
+        ];
+
+        $expectedOptions = [
+            [
+                'value' => '1',
+                'label' => 'Label',
+                '__disableTmpl' => true,
+            ],
+        ];
 
         $this->collectionFactoryMock->expects($this->once())
             ->method('create')
             ->willReturn($collectionMock);
         $collectionMock->expects($this->once())
             ->method('toOptionArray')
             ->willReturn($options);
-        $this->assertEquals($options, $this->model->toOptionArray());
-        $this->assertEquals($options, $this->model->toOptionArray());
+
+        $this->assertEquals($expectedOptions, $this->model->toOptionArray());
     }
 }

app/code/Magento/Sales/Ui/Component/Listing/Column/Status/Options.php

@@ -3,13 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Ui\Component\Listing\Column\Status;
 
 use Magento\Framework\Data\OptionSourceInterface;
 use Magento\Sales\Model\ResourceModel\Order\Status\CollectionFactory;
 
 /**
- * Class Options
+ * Class to transform Status options into a form of value-label pairs.
  */
 class Options implements OptionSourceInterface
 {
@@ -24,8 +25,6 @@ class Options implements OptionSourceInterface
     protected $collectionFactory;
 
     /**
-     * Constructor
-     *
      * @param CollectionFactory $collectionFactory
      */
     public function __construct(CollectionFactory $collectionFactory)
@@ -34,15 +33,22 @@ public function __construct(CollectionFactory $collectionFactory)
     }
 
     /**
-     * Get options
+     * Get options into array.
      *
      * @return array
      */
     public function toOptionArray()
     {
         if ($this->options === null) {
-            $this->options = $this->collectionFactory->create()->toOptionArray();
+            $options = $this->collectionFactory->create()->toOptionArray();
+
+            array_walk($options, function (&$option) {
+                $option['__disableTmpl'] = true;
+            });
+
+            $this->options = $options;
         }
+
         return $this->options;
     }
 }