MAGETWO-17690: 'Orders & Returns' widget type contain unnecessary tab

- Method isHidden and _addField modified;
- Added method setUp and dataProviders to unit test;

Author: Dmytro Poperechnyy

app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php

@@ -14,9 +14,13 @@ class Properties extends \Magento\Widget\Block\Adminhtml\Widget\Options implemen
     \Magento\Backend\Block\Widget\Tab\TabInterface
 {
     /**
-     * Widget config parameter
+     * Widget config parameters
+     *
+     * @var array
      */
-    const WIDGET_TEMPLATE_PARAMETER = 'template';
+    protected $hiddenParameters = [
+        'template'
+    ];
 
     /**
      * Prepare label for tab
@@ -57,9 +61,9 @@ public function isHidden()
     {
         $widgetConfig = $this->getWidgetInstance()->getWidgetConfigAsArray();
 
-        if (in_array('parameters', array_keys($widgetConfig))) {
+        if (isset($widgetConfig['parameters'])) {
             foreach ($widgetConfig['parameters'] as $key => $parameter) {
-                if ($parameter['visible'] == 1 && $key != self::WIDGET_TEMPLATE_PARAMETER) {
+                if ($parameter['visible'] == 1 && !in_array($key, $this->hiddenParameters)) {
                     return false;
                 }
             }
@@ -102,7 +106,7 @@ protected function _preparelayout()
      */
     protected function _addField($parameter)
     {
-        if ($parameter->getKey() != 'template') {
+        if (!in_array($parameter->getKey(), $this->hiddenParameters)) {
             return parent::_addField($parameter);
         }
         return false;

dev/tests/unit/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/PropertiesTest.php

@@ -7,34 +7,50 @@
 class PropertiesTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @param array $widgetConfig
-     * @param boolean $expected
-     *
-     * @dataProvider isHiddenDataProvider
+     * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    public function testIsHidden($widgetConfig, $expected)
-    {
-        /** @var \Magento\Widget\Model\Widget\Instance|\PHPUnit_Framework_MockObject_MockObject $widget */
-        $widget = $this->getMock('Magento\Widget\Model\Widget\Instance', [], [], '', false);
-        $widget->expects($this->atLeastOnce())->method('getWidgetConfigAsArray')->willReturn($widgetConfig);
+    protected $widget;
 
-        /** @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject $registry */
-        $registry = $this->getMock('Magento\Framework\Registry', [], [], '', false);
-        $registry->expects($this->atLeastOnce())
-            ->method('registry')
-            ->with('current_widget_instance')
-            ->willReturn($widget);
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $registry;
+
+    /**
+     * @var \Magento\Widget\Block\Adminhtml\Widget\Instance\Edit\Tab\Properties
+     */
+    protected $propertiesBlock;
+
+    protected function setUp()
+    {
+        $this->widget = $this->getMock('Magento\Widget\Model\Widget\Instance', [], [], '', false);
+        $this->registry = $this->getMock('Magento\Framework\Registry', [], [], '', false);
 
         $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
-        /** @var \Magento\Widget\Block\Adminhtml\Widget\Instance\Edit\Tab\Properties $propertiesBlock */
-        $propertiesBlock = $objectManager->getObject(
+        $this->propertiesBlock = $objectManager->getObject(
             'Magento\Widget\Block\Adminhtml\Widget\Instance\Edit\Tab\Properties',
             [
-                'registry' => $registry
+                'registry' => $this->registry
             ]
         );
+    }
+
+    /**
+     * @param array $widgetConfig
+     * @param boolean $isHidden
+     *
+     * @dataProvider isHiddenDataProvider
+     */
+    public function testIsHidden($widgetConfig, $isHidden)
+    {
+        $this->widget->expects($this->atLeastOnce())->method('getWidgetConfigAsArray')->willReturn($widgetConfig);
 
-        $this->assertEquals($expected, $propertiesBlock->isHidden());
+        $this->registry->expects($this->atLeastOnce())
+            ->method('registry')
+            ->with('current_widget_instance')
+            ->willReturn($this->widget);
+
+        $this->assertEquals($isHidden, $this->propertiesBlock->isHidden());
     }
 
     /**
@@ -56,7 +72,7 @@ public function isHiddenDataProvider()
                         ],
                     ]
                 ],
-                'expected' => true
+                'isHidden' => true
             ],
             [
                 'widgetConfig' => [
@@ -71,7 +87,22 @@ public function isHiddenDataProvider()
                         ],
                     ]
                 ],
-                'expected' => false
+                'isHidden' => false
+            ],
+            [
+                'widgetConfig' => [],
+                'isHidden' => true
+            ],
+            [
+                'widgetConfig' => [
+                    'parameters' => [
+                        'template' => [
+                            'type' => 'select',
+                            'visible' => '0',
+                        ],
+                    ]
+                ],
+                'isHidden' => true
             ]
         ];
     }