Merge remote-tracking branch 'origin/MAGETWO-63736' into troll_bugfix_kanban

Author: rganin

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php

@@ -155,8 +155,8 @@ private function setMessageToResponse($response, $messages)
     private function checkUniqueOption(DataObject $response, array $options = null)
     {
         if (is_array($options)
-            && isset($options['value'])
-            && isset($options['delete'])
+            && !empty($options['value'])
+            && !empty($options['delete'])
             && !$this->isUniqueAdminValues($options['value'], $options['delete'])
         ) {
             $this->setMessageToResponse($response, [__("The value of Admin must be unique.")]);

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/ValidateTest.php

@@ -198,8 +198,16 @@ public function testUniqueValidation(array $options, $isError)
     public function provideUniqueData()
     {
         return [
-            // valid options
-            [
+            'no values' => [
+                [
+                    'delete' => [
+                        "option_0" => "",
+                        "option_1" => "",
+                        "option_2" => "",
+                    ]
+                ], false
+            ],
+            'valid options' => [
                 [
                     'value' => [
                         "option_0" => [1, 0],
@@ -213,8 +221,7 @@ public function provideUniqueData()
                     ]
                 ], false
             ],
-            //with duplicate
-            [
+            'duplicate options' => [
                 [
                     'value' => [
                         "option_0" => [1, 0],
@@ -228,8 +235,7 @@ public function provideUniqueData()
                     ]
                 ], true
             ],
-            //with duplicate but deleted
-            [
+            'duplicate and deleted' => [
                 [
                     'value' => [
                         "option_0" => [1, 0],