Merge branch 'ACQE-6178_mainline_PR_development' of https://github.com/magento-gl/magento2ce into ACQE-6178_mainline_PR_development

Author: manjusha729

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest/StoreFrontValidateDynamicChangeOfShippingRateForGuestUserTest.xml

@@ -57,19 +57,19 @@
             <actionGroup ref="OpenStoreFrontCheckoutShippingPageActionGroup" stepKey="goToShippingPage"/>
             <!-- Guest checkout -->
             <actionGroup ref="FillGuestCheckoutShippingAddressFormActionGroup" stepKey="goToShippingAndFillDetails">
-                <argument name="customerAddress" value="US_CA_Address"/>
+                <argument name="customerAddress" value="US_Address_CA"/>
             </actionGroup>
             <selectOption selector="{{CheckoutShippingSection.region}}" userInput="California" stepKey="fillStateField"/>
             <waitForPageLoad stepKey="waitForChangeAfterStateLoad"/>
-            <actionGroup ref="CheckForFlatRateShippingMethodAvailabilityActionGroup" stepKey="verifyShippingMethod"/>
+            <actionGroup ref="StorefrontCheckForFlatRateShippingMethodAvailabilityActionGroup" stepKey="verifyShippingMethod"/>
             <waitForElementVisible selector="{{CheckoutShippingMethodsSection.shippingMethodDhlLabel}}" stepKey="waitForDHLLabelVisible"/>
             <waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodDhlWorldWideExpress}}" stepKey="waitForDHLPriceNotVisibleAfterStateChange"/>
             <waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShipping}}" stepKey="waitForFreeShippingNotVisible"/>
             <waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShippingLabel}}" stepKey="waitForFreeShippingLabelNotVisible"/>
             <!-- Change country value -->
             <selectOption selector="{{CheckoutShippingSection.country}}" userInput="Afghanistan" stepKey="fillCountryField"/>
             <waitForPageLoad stepKey="waitForChangeAfterCountryLoad"/>
-            <actionGroup ref="CheckForFlatRateShippingMethodAvailabilityActionGroup" stepKey="verifyShippingMethodAfterCountryChange"/>
+            <actionGroup ref="StorefrontCheckForFlatRateShippingMethodAvailabilityActionGroup" stepKey="verifyShippingMethodAfterCountryChange"/>
             <waitForElementVisible selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShipping}}" stepKey="waitForFreeShippingVisibleAfterCountryChange"/>
             <waitForElementVisible selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShippingLabel}}" stepKey="waitForFreeShippingLabelVisibleAfterCountryChange"/>
             <waitForElementVisible selector="{{CheckoutShippingMethodsSection.shippingMethodDhlLabel}}" stepKey="waitForDHLLabelVisibleAfterCountryChange"/>
@@ -79,10 +79,10 @@
             <selectOption selector="{{CheckoutShippingSection.country}}" userInput="United Kingdom" stepKey="fillCountry"/>
             <fillField selector="{{CheckoutShippingSection.city}}" userInput="London" stepKey="fillCity"/>
             <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="N14 5JP" stepKey="fillPostcode"/>
-            <actionGroup ref="CheckForFlatRateShippingMethodAvailabilityActionGroup" stepKey="verifyShippingMethodAfterNewData"/>
+            <actionGroup ref="StorefrontCheckForFlatRateShippingMethodAvailabilityActionGroup" stepKey="verifyShippingMethodAfterNewData"/>
             <waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShipping}}" stepKey="waitForFreeShippingVisibleAfterNewFormData"/>
             <waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShippingLabel}}" stepKey="waitForFreeShippingLabelVisibleAfterNewFormData"/>
-            <actionGroup ref="VerifyDHLShippingMethodIsVisibilityActionGroup" stepKey="dhlShippingVisibility"/>
+            <actionGroup ref="StorefrontVerifyDHLShippingMethodIsVisibilityActionGroup" stepKey="dhlShippingVisibility"/>
         <after>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>

app/code/Magento/Config/Test/Mftf/Data/DHLConfigData.xml

@@ -23,7 +23,7 @@
     <entity name="AdminCarriersDHLId">
         <data key="path">carriers/dhl/id</data>
         <data key="scope_id">1</data>
-        <data key="value">EvgeniyUSA</data>
+        <data key="value">{{_CREDS.magento/carriers_dhl_access_id}}</data>
     </entity>
     <entity name="AdminCarriersDHLPassword">
         <data key="path">carriers/dhl/password</data>
@@ -33,7 +33,7 @@
     <entity name="AdminCarriersDHLAccount">
         <data key="path">carriers/dhl/account</data>
         <data key="scope_id">1</data>
-        <data key="value">965269748</data>
+        <data key="value">{{_CREDS.magento/carriers_dhl_account_number}}</data>
     </entity>
     <entity name="AdminCarriersDHLAllowedAllCountries">
         <data key="path">carriers/dhl/sallowspecific</data>

app/code/Magento/Directory/Test/Mftf/Test/CustomCurrencySymbolWithSpaceTest.xml

@@ -65,7 +65,9 @@
         <click selector="{{AdminCurrencySymbolsGridSection.saveCurrencySymbols}}" stepKey="clickSaveCurrencySymbols"/>
         <waitForPageLoad stepKey="waitForSave"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="{{AdminSaveCurrencySymbolMessageData.success}}" stepKey="seeSuccessMessage"/>
-
+        <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
+            <argument name="tags" value="config full_page"/>
+        </actionGroup>
         <!--Redirect back to admin dashboard screen-->
         <actionGroup ref="AdminReloadDashboardDataActionGroup" stepKey="reloadDashboardData" />
         <!--Verify there is a space between custom currency symbol respective amounts on admin dashboard-->