Merge branch 'ACQE-8003' into ACQE-functional-deployment-v3-3

Author: Karishmathakare19

app/code/Magento/Config/Test/Mftf/Test/DateFiltersInCustomInstanceTimeZoneTest.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+/**
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -25,43 +25,56 @@
             <!--Set needed Timezone-->
             <selectOption userInput="New Zealand Standard Time (Antarctica/McMurdo)" selector="{{LocaleOptionsSection.timeZoneDropdown}}" stepKey="selectOption1"/>
             <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfiguration"/>
-            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAsAdmin"/>
+            <!-- Wait for configuration to be applied-->
+            <waitForPageLoad stepKey="waitForConfigurationSave"/>
+            <!-- Clear cache to ensure timezone change takes effect-->
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCacheAfterTimezoneChange">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
         </before>
         <after>
+            <!-- Go to *General > General > Locale Options* section -->
             <actionGroup ref="AdminNavigateToDefaultLocaleSettingActionGroup" stepKey="redirectAgain"/>
+            <!-- Reset timezone to default-->
             <selectOption userInput="Central Standard Time (America/Chicago)" selector="{{LocaleOptionsSection.timeZoneDropdown}}" stepKey="selectDefaultoption"/>
-            <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfiguration"/>
+            <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfigurationAgain"/>
+            <!-- Clear cache to ensure default timezone change takes effect-->
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCacheAfterDefaultTimezone">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
+            <!-- Logout customer from storefront (if logged in) -->
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
             <!-- Delete customer -->
-            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
                 <argument name="customerEmail" value="Simple_US_Customer.email"/>
             </actionGroup>
+            <!-- Logout from admin -->
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAsAdmin"/>
         </after>
         <!-- Create Customer -->
         <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="signUpNewUser">
             <argument name="Customer" value="Simple_US_Customer"/>
         </actionGroup>
-        <!--Login to Admin-->
-        <actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
         <!--Go to *Customers > All Customers* page-->
-        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToAllCustomerPage">
-            <argument name="menuUiId" value="{{AdminMenuCustomers.dataUiId}}"/>
-            <argument name="submenuUiId" value="{{AdminMenuCustomersAllCustomers.dataUiId}}"/>
-        </actionGroup>
-        <!--Clear Filters if Present on Customer Grid Page-->
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="GoToCustomerPage"/>
+        <waitForPageLoad stepKey="waitForCustomersPage2"/>
+        <!-- Clear Filters if Present on Customer Grid Page-->
         <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
         <!-- Click on Filters-->
         <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="clickOnFilters"/>
+        <!--Wait for filter form to be visible-->
+        <waitForElementVisible selector="{{AdminDataGridHeaderSection.dateFilterFrom}}" stepKey="waitForDateFilterFields"/>
         <!-- Generate Today's Date to set in filter-->
         <!--<generateDate date="now" format="m/d/Y" stepKey="today"/>-->
-        <generateDate date="now" format="m/j/Y" timezone="Antarctica/McMurdo" stepKey="today"/>
+        <generateDate date="now" format="m/d/Y" timezone="Antarctica/McMurdo" stepKey="today"/>
         <!--Set the *Customer Since* filter From Date-->
         <fillField selector="{{AdminDataGridHeaderSection.dateFilterFrom}}" userInput="{$today}" stepKey="fillDateFrom"/>
         <!--Set the *Customer Since* filter To Date-->
         <fillField selector="{{AdminDataGridHeaderSection.dateFilterTo}}" userInput="{$today}" stepKey="fillDateto"/>
         <!-- Apply Filter-->
         <actionGroup ref="AdminGridFilterApplyActionGroup" stepKey="applyFilter"/>
+        <!--Wait for grid to update after filter application-->
+        <waitForPageLoad stepKey="waitForGridUpdate"/>
         <!--Customer *A* is present in the grid-->
         <actionGroup ref="AdminAssertCustomerInCustomersGrid" stepKey="assertCustomer1InGrid">
             <argument name="text" value="{{Simple_US_Customer.email}}"/>