MC-39911: [MFTF] AdminFPTIncludingAndExcludingTaxVisibleOnNegotiableQuotePageTest fails because of bad design

Author: zakdma

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

@@ -19,7 +19,7 @@
         <!-- It sometimes is loading too long for default 10s -->
         <waitForPageLoad time="60" stepKey="waitForPageFullyLoaded"/>
         <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="clearExistingFilters"/>
-        <fillField selector="{{AdminProductAttributeGridSection.attributeCodeFilter}}" userInput="{{codeFilter}}" stepKey="fillAttributeCodeFilterField"/>
+        <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="{{codeFilter}}" stepKey="fillAttributeCodeFilterField"/>
         <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="applyGridFilter"/>
         <helper class="\Magento\Catalog\Test\Mftf\Helper\CatalogHelper" method="deleteAllProductAttributesOneByOne" stepKey="deleteAllProductAttributesOneByOne">
             <argument name="notEmptyRow">{{AdminDataGridTableSection.firstNotEmptyRow2}}</argument>

app/code/Magento/Catalog/Test/Mftf/Helper/CatalogHelper.php

@@ -20,7 +20,7 @@ class CatalogHelper extends Helper
     /**
      * Delete all product attributes one by one.
      *
-     * @param string $firstNotEmptyRow
+     * @param string $notEmptyRow
      * @param string $modalAcceptButton
      * @param string $deleteButton
      * @param string $successMessageContainer
@@ -45,10 +45,10 @@ public function deleteAllProductAttributesOneByOne(
                 $magentoWebDriver->waitForPageLoad(30);
                 $magentoWebDriver->click($deleteButton);
                 $magentoWebDriver->waitForPageLoad(30);
-                $magentoWebDriver->waitForElementVisible($modalAcceptButton, 10);
+                $magentoWebDriver->waitForElementVisible($modalAcceptButton);
                 $magentoWebDriver->click($modalAcceptButton);
                 $magentoWebDriver->waitForPageLoad(60);
-                $magentoWebDriver->waitForElementVisible($successMessageContainer, 10);
+                $magentoWebDriver->waitForElementVisible($successMessageContainer);
                 $magentoWebDriver->see($successMessage, $successMessageContainer);
                 $gridRows = $webDriver->findElements(WebDriverBy::cssSelector($notEmptyRow));
             }

app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeGridSection.xml

@@ -17,7 +17,6 @@
         <element name="FirstRow" type="button" selector="//*[@id='attributeGrid_table']/tbody/tr[1]" timeout="30"/>
         <element name="FilterByAttributeCode" type="input" selector="#attributeGrid_filter_attribute_code"/>
         <element name="attributeLabelFilter" type="input" selector="//input[@name='frontend_label']"/>
-        <element name="attributeCodeFilter" type="input" selector=".data-grid-filters input[name='attribute_code']"/>
         <element name="attributeCodeColumn" type="text" selector="//div[@id='attributeGrid']//td[contains(@class,'col-attr-code col-attribute_code')]"/>
         <element name="defaultLabelColumn" type="text" selector="//div[@id='attributeGrid']//table[@id='attributeGrid_table']//tbody//td[contains(@class,'col-label col-frontend_label')]"/>
         <element name="isVisibleColumn" type="text" selector="//div[@id='attributeGrid']//td[contains(@class,'a-center col-is_visible')]"/>