Merge remote-tracking branch 'origin/MC-12129' into 2.3-develop-mftf-pr19

Author: zakdma

app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetBaseCurrencyActionGroup.xml

@@ -0,0 +1,19 @@
+<?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">
+    <!-- Set base currency -->
+    <actionGroup name="AdminSetBaseCurrencyActionGroup" extends="AdminSaveConfigActionGroup">
+        <arguments>
+            <argument name="currency" type="string"/>
+        </arguments>
+        <uncheckOption selector="{{CurrencySetupSection.baseCurrencyUseDefault}}" before="clickSaveConfigBtn" stepKey="uncheckUseDefaultOption"/>
+        <selectOption selector="{{CurrencySetupSection.baseCurrency}}" userInput="{{currency}}" after="uncheckUseDefaultOption" stepKey="setBaseCurrencyField"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml

@@ -10,6 +10,8 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CurrencySetupSection">
         <element name="allowCurrencies" type="select" selector="#currency_options_allow"/>
+        <element name="baseCurrency" type="select" selector="#currency_options_base"/>
+        <element name="baseCurrencyUseDefault" type="checkbox" selector="#currency_options_base_inherit"/>
         <element name="currencyOptions" type="select" selector="#currency_options-head"/>
     </section>
-</sections>
+</sections>

app/code/Magento/Customer/Test/Mftf/Test/VerifyDisabledCustomerGroupFieldTest.xml

@@ -26,8 +26,7 @@
 
         <!-- 2. Navigate to Customers > Customer Groups -->
         <amOnPage url="{{AdminCustomerGroupPage.url}}" stepKey="amOnCustomerGroupPage" />
-        <waitForPageLoad stepKey="waitForCustomerGroupsPageLoad" />
-        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearFilters"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearFiltersIfTheySet"/>
 
         <!-- 3. Select system Customer Group specified in data set from grid -->
         <click selector="{{AdminCustomerGroupMainSection.editButtonByCustomerGroupCode(NotLoggedInCustomerGroup.code)}}" stepKey="clickOnEditCustomerGroup" />