MAGETWO-95426: Unable to set default option for swatch attribute

Author: OlgaVasyltsun

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml

@@ -31,11 +31,13 @@
             <argument name="productAttribute"/>
         </arguments>
         <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForPageLoad stepKey="waitForAttributesGridPageLoad"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
+        <waitForPageLoad stepKey="waitForAttributesGridPageLoad1"/>
         <fillField selector="{{AdminProductAttributeGridSection.gridFilterAttributeCode}}"
                    userInput="{{productAttribute.attribute_code}}" stepKey="setAttributeCode"/>
-        <click selector="{{AdminProductAttributeGridSection.search}}" stepKey="searchForAttributeFromTheGrid"/>
-        <click selector="{{AdminProductAttributeGridSection.firstRow}}" stepKey="clickOnAttributeRow"/>
-        <waitForPageLoad stepKey="waitForPageLoad1" />
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="searchForAttributeFromTheGrid"/>
+        <click selector="{{AdminDataGridTableSection.row('1')}}" stepKey="clickOnAttributeRow"/>
+        <waitForPageLoad stepKey="waitForAttributePageLoad" />
     </actionGroup>
 </actionGroups>

app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeEditPage.xml

@@ -11,5 +11,7 @@
     <page name="AdminProductAttributeEditPage" url="catalog/product_attribute/edit/" area="admin" module="Magento_Catalog">
         <section name="AdminProductAttributeEditSection"/>
         <section name="AdminConfirmationModalSection"/>
+        <section name="AdminMainActionsSection"/>
+        <section name="AdminMessagesSection"/>
     </page>
 </pages>

app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDropdownAttributeTest.xml

@@ -55,7 +55,7 @@
                    userInput="Fish & Chips" stepKey="fillAdminValue2"/>
 
         <!-- Save the new product attribute -->
-        <click selector="{{AttributePropertiesSection.Save}}" stepKey="clickSave1"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSave1"/>
         <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}"
                                stepKey="waitForSuccessMessage"/>
 

app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchWithNonValidOptionsTest.xml

@@ -60,7 +60,7 @@
         <scrollToTopOfPage stepKey="scrollToTop"/>
 
         <!-- Save the new product attribute -->
-        <click selector="{{AttributePropertiesSection.Save}}" stepKey="clickSave1"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSave1"/>
         <waitForElementVisible selector="{{AdminMessagesSection.error}}" stepKey="waitForError"/>
 
         <!-- Fill options data -->
@@ -96,7 +96,7 @@
         <click selector="{{AdminManageSwatchSection.nthIsDefault('2')}}" stepKey="setSecondOptionAsDefault"/>
 
         <!-- Save the new product attribute -->
-        <click selector="{{AttributePropertiesSection.Save}}" stepKey="clickSave2"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSave2"/>
         <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}"
                                stepKey="waitForSuccessMessage"/>