Merge remote-tracking branch 'origin/MAGETWO-51015' into develop

Author: Yaroslav Onischenko

app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php

@@ -66,7 +66,7 @@ public function getAllOptions($withEmpty = true, $defaultValues = false)
         }
         $options = $defaultValues ? $this->_optionsDefault[$storeId] : $this->_options[$storeId];
         if ($withEmpty) {
-            array_unshift($options, ['label' => '', 'value' => '']);
+            array_unshift($options, ['label' => $this->getAttribute()->getIsRequired() ? '' : ' ', 'value' => '']);
         }
 
         return $options;
@@ -89,7 +89,7 @@ public function getSpecificOptions($ids, $withEmpty = true)
             ->load()
             ->toOptionArray();
         if ($withEmpty) {
-            array_unshift($options, ['label' => '', 'value' => '']);
+            array_unshift($options, ['label' => $this->getAttribute()->getIsRequired() ? '' : ' ', 'value' => '']);
         }
         return $options;
     }

app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/TableTest.php

@@ -120,7 +120,7 @@ public function testGetSpecificOptions($optionIds, $withEmpty)
 
         $attribute = $this->getMock(
             'Magento\Eav\Model\Entity\Attribute\AbstractAttribute',
-            ['getId', 'getStoreId', '__wakeup'],
+            ['getId', 'getStoreId', 'getIsRequired', '__wakeup'],
             [],
             '',
             false
@@ -131,6 +131,9 @@ public function testGetSpecificOptions($optionIds, $withEmpty)
         $attribute->expects($this->once())
             ->method('getStoreId')
             ->willReturn($storeId);
+        $attribute->expects($this->any())
+            ->method('getIsRequired')
+            ->willReturn(false);
 
         $this->model->setAttribute($attribute);
 
@@ -160,7 +163,7 @@ public function testGetSpecificOptions($optionIds, $withEmpty)
             ->willReturn($options);
 
         if ($withEmpty) {
-            array_unshift($options, ['label' => '', 'value' => '']);
+            array_unshift($options, ['label' => ' ', 'value' => '']);
         }
 
         $this->assertEquals($options, $this->model->getSpecificOptions($optionIds, $withEmpty));

app/code/Magento/Swatches/view/adminhtml/web/js/text.js

@@ -46,9 +46,6 @@ define([
                         data.intype = swatchOptionTextDefaultInputType;
                     }
 
-                    if (!this.totalItems) {
-                        data.checked = 'checked';
-                    }
                     element = this.template({
                         data: data
                     });

app/code/Magento/Swatches/view/adminhtml/web/js/visual.js

@@ -49,9 +49,6 @@ define([
                         data.intype = swatchOptionVisualDefaultInputType;
                     }
 
-                    if (!this.totalItems) {
-                        data.checked = 'checked';
-                    }
                     element = this.template({
                         data: data
                     });