MAGETWO-55814: East team cadenece 3 PR

- FAT tests fix and duplication of code removing

Author: vzabaznov

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

@@ -22,6 +22,11 @@ class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
      */
     protected $layoutFactory;
 
+    /**
+     * @var array
+     */
+    private $multipleAttributeList;
+
     /**
      * Constructor
      *
@@ -31,18 +36,21 @@ class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
+     * @param array $multipleAttributeList
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\Cache\FrontendInterface $attributeLabelCache,
         \Magento\Framework\Registry $coreRegistry,
         \Magento\Framework\View\Result\PageFactory $resultPageFactory,
         \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
-        \Magento\Framework\View\LayoutFactory $layoutFactory
+        \Magento\Framework\View\LayoutFactory $layoutFactory,
+        array $multipleAttributeList = []
     ) {
         parent::__construct($context, $attributeLabelCache, $coreRegistry, $resultPageFactory);
         $this->resultJsonFactory = $resultJsonFactory;
         $this->layoutFactory = $layoutFactory;
+        $this->multipleAttributeList = $multipleAttributeList;
     }
 
     /**
@@ -90,7 +98,15 @@ public function execute()
             }
         }
 
-        $this->checkUniqueOption($response, $this->getRequest()->getParam("option"));
+        $multipleOption = $this->getRequest()->getParam("frontend_input");
+        $multipleOption = is_null($multipleOption) ? 'select' : $multipleOption;
+
+        if (isset($this->multipleAttributeList[$multipleOption]) && !is_null($multipleOption)) {
+            $this->checkUniqueOption(
+                $response,
+                $this->getRequest()->getParam($this->multipleAttributeList[$multipleOption])
+            );
+        }
 
         return $this->resultJsonFactory->create()->setJsonData($response->toJson());
     }

app/code/Magento/Catalog/etc/adminhtml/di.xml

@@ -47,6 +47,13 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Controller\Adminhtml\Product\Attribute\Validate">
+        <arguments>
+            <argument name="multipleAttributeList" xsi:type="array">
+                <item name="select" xsi:type="string">option</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Catalog\Model\Product\Copier">
         <arguments>
             <argument name="copyConstructor" xsi:type="object">Magento\Catalog\Model\Product\CopyConstructor\Composite</argument>