Merge branch 'ACQE-6747_2' into ACQE-7021-functional-tests-mainline-deployment

Author: manjusha729

app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchStoreViewScopeActionGroup.xml

@@ -0,0 +1,21 @@
+<?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="AdminSwitchStoreViewScopeActionGroup" extends="AdminSwitchStoreViewActionGroup">
+        <annotations>
+            <description>Selects the provided "Store View" dropdown menu on the Admin Grid pages other than "Default Store View" as well.</description>
+        </annotations>
+        <arguments>
+            <argument name="storeView" defaultValue="customStore.name"/>
+        </arguments>
+        <remove keyForRemoval="waitForStoreViewsAreVisible"/>
+        <waitForElementVisible selector="{{AdminMainActionsSection.storeViewByName(storeView)}}"  after="clickStoreViewSwitchDropdown" stepKey="waitForStoreViewsVisible"/>
+    </actionGroup>
+</actionGroups>