Merge branch 'MAGETWO-45073' into BUGS

Author: okarpenko

app/code/Magento/Swatches/Model/Plugin/EavAttribute.php

@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 use Magento\Swatches\Model\Swatch;
+use Magento\Framework\Exception\InputException;
 
 /**
  * Plugin model for Catalog Resource Attribute
@@ -72,13 +73,29 @@ public function __construct(
      */
     public function beforeSave(Attribute $attribute)
     {
-        if ($this->swatchHelper->isSwatchAttribute($attribute)) {
+        if ($this->swatchHelper->isSwatchAttribute($attribute) && $this->validateOptions($attribute)) {
             $this->setProperOptionsArray($attribute);
             $this->swatchHelper->assembleAdditionalDataEavAttribute($attribute);
         }
         $this->convertSwatchToDropdown($attribute);
     }
 
+    /**
+     * Validate that attribute options exist
+     *
+     * @param Attribute $attribute
+     * @return bool
+     * @throws InputException
+     */
+    protected function validateOptions(Attribute $attribute)
+    {
+        $attributeSavedOptions = $attribute->getSource()->getAllOptions(false);
+        if (!count($attributeSavedOptions)) {
+            throw new InputException(__('Admin is a required field in the each row'));
+        }
+        return true;
+    }
+
     /**
      * Swatch save operations
      *

app/code/Magento/Swatches/Test/Unit/Model/Plugin/EavAttributeTest.php

@@ -54,6 +54,9 @@ class EavAttributeTest extends \PHPUnit_Framework_TestCase
     /** @var array */
     private $dependencyArray = [];
 
+    /** @var \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource|\PHPUnit_Framework_MockObject_MockObject */
+    protected $source;
+
     public function setUp()
     {
         $this->attribute = $this->getMock('\Magento\Catalog\Model\ResourceModel\Eav\Attribute', [], [], '', false);
@@ -87,6 +90,13 @@ public function setUp()
                 'swatchHelper' => $this->swatchHelper,
             ]
         );
+        $this->source = $this->getMockForAbstractClass(
+            'Magento\Eav\Model\Entity\Attribute\Source\AbstractSource',
+            [],
+            '',
+            false
+        );
+
 
         $this->optionIds = [
             'value' => ['option 89' => 'test 1', 'option 114' => 'test 2', 'option 170' => 'test 3'],
@@ -117,6 +127,19 @@ public function testBeforeSaveVisualSwatch()
                 ['swatch', self::ATTRIBUTE_SWATCH_VALUE]
             );
 
+        $this->attribute->expects($this->once())
+            ->method('getSource')
+            ->willReturn($this->source);
+        $this->source->expects($this->once())
+            ->method('getAllOptions')
+            ->with(false)
+            ->willReturn([
+                [
+                    'value' => 'value',
+                    'label' => 'label'
+                ]
+            ]);
+
         $this->swatchHelper->expects($this->once())->method('assembleAdditionalDataEavAttribute')
             ->with($this->attribute);
         $this->swatchHelper->expects($this->once())->method('isVisualSwatch')
@@ -153,6 +176,19 @@ public function testBeforeSaveTextSwatch()
                 ['swatch', self::ATTRIBUTE_SWATCH_VALUE]
             );
 
+        $this->attribute->expects($this->once())
+            ->method('getSource')
+            ->willReturn($this->source);
+        $this->source->expects($this->once())
+            ->method('getAllOptions')
+            ->with(false)
+            ->willReturn([
+                [
+                    'value' => 'value',
+                    'label' => 'label'
+                ]
+            ]);
+
         $this->swatchHelper->expects($this->once())->method('assembleAdditionalDataEavAttribute')
             ->with($this->attribute);
         $this->swatchHelper->expects($this->once())->method('isVisualSwatch')
@@ -168,6 +204,27 @@ public function testBeforeSaveTextSwatch()
         $this->eavAttribute->beforeSave($this->attribute);
     }
 
+    /**
+     * @expectedException \Magento\Framework\Exception\InputException
+     * @expectedExceptionMessage Admin is a required field in the each row
+     */
+    public function testBeforeSaveWithFailedValidation()
+    {
+        $this->swatchHelper->expects($this->once())->method('isSwatchAttribute')
+            ->with($this->attribute)
+            ->willReturn(true);
+
+        $this->attribute->expects($this->once())
+            ->method('getSource')
+            ->willReturn($this->source);
+        $this->source->expects($this->once())
+            ->method('getAllOptions')
+            ->with(false)
+            ->willReturn([]);
+
+        $this->eavAttribute->beforeSave($this->attribute);
+    }
+
     public function testBeforeSaveNotSwatch()
     {
         $additionalData = [