Merge branch 'ACQE-8918' into ACQE-functional-deployment-v4-7

Author: Karishmathakare19

app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontVerifyCustomerDefaultCookieExpiryDateActionGroup.xml

@@ -17,6 +17,9 @@
             <argument name="timeUnit" type="string" defaultValue="minute"/>
         </arguments>
 
+        <!--Generate expected date first to avoid race condition-->
+        <generateDate date="{{timezoneOffset}} {{timeUnit}}" format="d/m/Y" timezone="UTC" stepKey="generateExpireDate"/>
+
         <!--Verify that there are cookies exists with the given name `section_data_ids`, `mage-cache-sessid`, `mage-cache-storage`-->
         <seeCookie userInput="section_data_ids" stepKey="seeCookieForMagentoSectionDataIds"/>
         <seeCookie userInput="mage-cache-sessid" stepKey="seeCookieForMagentoCacheSessionId"/>
@@ -27,9 +30,6 @@
         <grabCookieAttributes userInput="mage-cache-sessid" stepKey="grabCookieForMagentoCacheSessionId"/>
         <grabCookieAttributes userInput="mage-cache-storage" stepKey="grabCookieForMagentoCacheStorage"/>
 
-        <!--Grab expected date-->
-        <generateDate date="{{timezoneOffset}} {{timeUnit}}" format="d/m/Y" timezone="UTC" stepKey="generateExpireDate"/>
-
         <!--Assert cookies `section_data_ids`, `mage-cache-sessid`, `mage-cache-storage` having expiry date equal to expected date-->
         <assertEquals stepKey="validateExpiryDateForMagentoDataIds">
             <actualResult type="string">{{$grabCookieForMagentoDataIds['expiry']}}</actualResult>

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

@@ -43,15 +43,14 @@
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginCustomer">
             <argument name="Customer" value="$$createCustomer$$"/>
         </actionGroup>
-        <see userInput="Welcome, $$createCustomer.firstname$$ $$createCustomer.lastname$$!" selector="{{StorefrontPanelHeaderSection.welcomeMessage}}" stepKey="checkWelcomeMessage"/>
 
-        <!--Grab timezone offset-->
-        <executeJS function="return -(new Date().getTimezoneOffset());" stepKey="getTimezoneOffset"/>
-        <!--Verify default expiry date for cookies-->
+        <!--Verify default expiry date for cookies immediately after login to avoid race condition-->
         <actionGroup ref="StorefrontVerifyCustomerDefaultCookieExpiryDateActionGroup" stepKey="VerifyCookiesExpiryDate">
-            <argument name="timezoneOffset" value="{$getTimezoneOffset}"/>
+            <argument name="timezoneOffset" value="60"/>
         </actionGroup>
 
+        <see userInput="Welcome, $$createCustomer.firstname$$ $$createCustomer.lastname$$!" selector="{{StorefrontPanelHeaderSection.welcomeMessage}}" stepKey="checkWelcomeMessage"/>
+
         <!--Logout customer before in case of it logged in from previous test-->
         <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogoutStorefront"/>
 
@@ -87,10 +86,9 @@
         </actionGroup>
         <actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButtonFirstAttempt"/>
 
-        <!--Grab current timezone offset after 30 days-->
-        <executeJS function="return {$getTimezoneOffset} + (30*24*60);" stepKey="getTimezoneOffsetAfterReset"/>
+        <!--Verify cookies expiry date after 30 days immediately after login (cookie lifetime is set to 2592000 seconds = 43200 minutes)-->
         <actionGroup ref="StorefrontVerifyCustomerDefaultCookieExpiryDateActionGroup" stepKey="VerifyCookiesExpiryDateAfterReset">
-            <argument name="timezoneOffset" value="{$getTimezoneOffsetAfterReset}"/>
+            <argument name="timezoneOffset" value="43200"/>
         </actionGroup>
     </test>
 </tests>