MAGETWO-44516: Provide fix for Functional Tests MX

Author: Maksym Aposov

dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php

@@ -160,16 +160,27 @@ class Attribute extends Form
      */
     public function fillAttributes(array $attributes)
     {
+        $attributesFilters = [];
         foreach ($attributes as $attribute) {
             if (empty($attribute['attribute_id'])) {
                 $this->createNewVariationSet($attribute);
             }
+            $attributesFilters[] = ['frontend_label' => $attribute['frontend_label']];
         }
 
-        foreach ($attributes as $attribute) {
-            $this->getAttributesGrid()->searchAndSelect(['frontend_label' => $attribute['frontend_label']]);
-            $this->browser->find($this->nextButton)->click();
-            $this->getTemplateBlock()->waitLoader();
+        //select attributes
+        $this->getAttributesGrid()->resetFilter();
+        if ($this->_rootElement->find('[class$=no-data]')->isVisible()) {
+            return;
+        }
+        $this->getAttributesGrid()->selectItems($attributesFilters);
+
+        $this->browser->find($this->nextButton)->click();
+        $this->getTemplateBlock()->waitLoader();
+
+        //update attributes options
+        foreach ($attributes as $attribute)
+        {
             $this->updateOptions($attribute);
         }
 

dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php

@@ -286,15 +286,15 @@ public function massaction(array $items, $action, $acceptAlert = false, $massAct
      * @return void
      * @throws \Exception
      */
-    protected function selectItems(array $items)
+    public function selectItems(array $items)
     {
         $this->sortGridByField('ID');
         foreach ($items as $item) {
             $this->_rootElement->find($this->currentPage)->setValue('');
             $this->waitLoader();
             $selectItem = $this->getRow($item)->find($this->selectItem);
             do {
-                if ($selectItem->isVisible()) {
+                if ($selectItem->isVisible() && !$selectItem->isSelected()) {
                     $selectItem->click();
                     break;
                 }