MC-33823: Merge CE, EE and B2B changes

Author: Oleksandr Gorkun

app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml

@@ -25,7 +25,8 @@
         <see userInput="{{MinMaxQueryLength.Hint}}" selector="{{AdminCatalogSearchConfigurationSection.maxQueryLengthHint}}" stepKey="seeHint2"/>
         <uncheckOption selector="{{AdminCatalogSearchConfigurationSection.minQueryLengthInherit}}" stepKey="uncheckSystemValue"/>
         <fillField selector="{{AdminCatalogSearchConfigurationSection.minQueryLength}}" userInput="{{minLength}}" stepKey="setMinQueryLength"/>
-        <scrollTo selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="scrollToCollapseTab"/>
+        <scrollTo selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" y="-50" stepKey="scrollToCollapseTab"/>
+        <waitForElementVisible selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="seeCollapseTab" />
         <click selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="collapseTab"/>
         <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig"/>
         <waitForPageLoad stepKey="waitForConfigSaved"/>

app/code/Magento/Config/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml

@@ -7,9 +7,9 @@
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCatalogSearchConfigurationSection">
-        <element name="catalogSearchTab" type="button" selector="#catalog_search-head"/>
+        <element name="catalogSearchTab" type="button" selector="a#catalog_search-head"/>
         <element name="checkIfCatalogSearchTabExpand" type="button" selector="#catalog_search-head:not(.open)"/>
         <element name="searchEngineDefaultSystemValue" type="checkbox" selector="#catalog_search_engine_inherit"/>
         <element name="searchEngine" type="select" selector="#catalog_search_engine"/>
     </section>
-</sections>
+</sections>