Merge remote-tracking branch 'tangoc/MAGETWO-43343' into new_pr_bugs

Author: Bohdan Korablov

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php

@@ -51,10 +51,11 @@ public function getColumn()
     public function render(DataObject $row)
     {
         if ($this->getColumn()->getEditable()) {
-            $value = $this->_getValue($row);
-            return '<div class="admin__grid-control">' .
-            '<span class="admin__grid-control-value">' . $value . '</span>' .
-            $this->_getInputValueElement($row) . '</div>' ;
+            $result = '<div class="admin__grid-control">';
+            $result .= $this->getColumn()->getEditOnly() ? ''
+                : '<span class="admin__grid-control-value">' . $this->_getValue($row) . '</span>';
+
+            return $result . $this->_getInputValueElement($row) . '</div>' ;
         }
         return $this->_getValue($row);
     }

app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Renderer/AbstractRendererTest.php

@@ -0,0 +1,107 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Backend\Test\Unit\Block\Widget\Grid\Column\Renderer;
+
+class AbstractRendererTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Backend\Block\Widget\Grid\Column|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $columnMock;
+
+    /**
+     * @var \Magento\Framework\DataObject|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $dataObjectMock;
+
+    /**
+     * @var \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
+     */
+    protected $renderer;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->dataObjectMock = $this->getMock('Magento\Framework\DataObject', ['getData'], [], '', false);
+        $this->columnMock = $this->getMockBuilder('Magento\Backend\Block\Widget\Grid\Column')
+            ->disableOriginalConstructor()
+            ->setMethods(['getEditable', 'getIndex', 'getEditOnly', 'getId'])
+            ->getMock();
+        $this->renderer = $this->getMockBuilder('Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer')
+            ->disableOriginalConstructor()
+            ->setMethods(null)
+            ->getMock();
+    }
+
+    /**
+     * @param bool $editable
+     * @param bool $onlyEdit
+     * @param string $expectedResult
+     * @return void
+     * @dataProvider renderDataProvider
+     */
+    public function testRender($editable, $onlyEdit, $expectedResult)
+    {
+        $value = 'some value';
+        $keyValue = 'key';
+
+        $this->columnMock->expects($this->once())
+            ->method('getEditable')
+            ->willReturn($editable);
+        $this->columnMock->expects($this->any())
+            ->method('getEditOnly')
+            ->willReturn($onlyEdit);
+        $this->columnMock->expects($this->any())
+            ->method('getIndex')
+            ->willReturn($keyValue);
+        $this->columnMock->expects($this->any())
+            ->method('getId')
+            ->willReturn('test');
+        $this->dataObjectMock->expects($this->any())
+            ->method('getData')
+            ->with($keyValue)
+            ->willReturn($value);
+        $this->renderer->setColumn($this->columnMock);
+
+        $this->assertEquals($expectedResult, $this->renderer->render($this->dataObjectMock));
+    }
+
+    /**
+     * @return array
+     */
+    public function renderDataProvider()
+    {
+        return [
+            [
+                'editable' => false,
+                'onlyEdit' => false,
+                'expectedResult' => 'some value'
+            ],
+            [
+                'editable' => false,
+                'onlyEdit' => true,
+                'expectedResult' => 'some value'
+            ],
+            [
+                'editable' => true,
+                'onlyEdit' => false,
+                'expectedResult' => '<div class="admin__grid-control">'
+                    . '<span class="admin__grid-control-value">some value</span>'
+                    . '<input type="text" class="input-text " name="test" value="some value"/>'
+                    . '</div>'
+            ],
+            [
+                'editable' => true,
+                'onlyEdit' => true,
+                'expectedResult' => '<div class="admin__grid-control">'
+                    . '<input type="text" class="input-text " name="test" value="some value"/>'
+                    . '</div>'
+            ],
+        ];
+    }
+}