Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into ACP2E-1028

Author: dhorytskyi

app/code/Magento/Elasticsearch/Test/Mftf/Test/StorefrontProductQuickSearchUsingElasticSearchWithSynonymsTest.xml

@@ -81,8 +81,8 @@
 
         <!-- Create 3rd synonym -->
         <actionGroup ref="AdminNavigateToNewSearchSynonymsPageActionGroup" stepKey="navigateToNewThirdSearchSynonym"/>
-        <actionGroup ref="AdminFillNewSearchSynonymsActionGroup" stepKey="fillThirdSearchSynonym">
-            <argument name="scope_id" value="1:3"/>
+        <actionGroup ref="AdminFillNewSearchSynonymsForCustomScopeActionGroup" stepKey="fillThirdSearchSynonym">
+            <argument name="scopeName" value="{{customStore.name}}"/>
             <argument name="synonyms" value="customview,simple"/>
         </actionGroup>
         <click selector="{{AdminSearchSynonymsNewSection.save}}" stepKey="clickSaveSynonymThreeButton"/>

app/code/Magento/Search/Test/Mftf/ActionGroup/AdminFillNewSearchSynonymsForCustomScopeActionGroup.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminFillNewSearchSynonymsForCustomScopeActionGroup">
+        <annotations>
+            <description>Fills the search synonyms form field with a custom Scope.</description>
+        </annotations>
+        <arguments>
+            <argument name="scopeName" type="string"/>
+            <argument name="synonyms" type="string"/>
+        </arguments>
+
+        <click selector="{{AdminSearchSynonymsNewSection.scope}}" stepKey="clickScopeSelector"/>
+        <waitForElementVisible selector="{{AdminSearchSynonymsNewSection.selectScope(scopeName)}}" stepKey="waitForScopesList"/>
+        <click selector="{{AdminSearchSynonymsNewSection.selectScope(scopeName)}}" stepKey="clickStoreView"/>
+        <fillField selector="{{AdminSearchSynonymsNewSection.synonyms}}" userInput="{{synonyms}}" stepKey="fillSynonyms"/>
+        <checkOption selector="{{AdminSearchSynonymsNewSection.merge}}" stepKey="checkCheckbox"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Search/Test/Mftf/Section/AdminSearchSynonymsNewSection.xml

@@ -14,5 +14,6 @@
         <element name="scope" type="select" selector="//select[@name='scope_id']"/>
         <element name="synonyms" type="textarea" selector="//textarea[@name='synonyms']"/>
         <element name="merge" type="checkbox" selector="//input[@name='mergeOnConflict']"/>
+        <element name="selectScope" type="select" selector="//option[contains(text(),'{{scopeName}}')]" parameterized="true"/>
     </section>
 </sections>