Skip to content

Commit b2369a9

Browse files
nishant04412nishant04412
committed
Merge remote-tracking branch 'origin/ACP2E-242' into L3_Arrows_PR_20220406
2 parents 44f6a52 + 0934216 commit b2369a9

File tree

2 files changed

+80
-1
lines changed

2 files changed

+80
-1
lines changed

‎app/code/Magento/Customer/Test/Mftf/Test/StorefrontCustomerDataStorageOnSessionTimeoutTest.xml

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="StorefrontCustomerDataStorageOnSessionTimeoutTest">
12+
<annotations>
13+
<features value="Customer"/>
14+
<stories value="Login"/>
15+
<title value="Remove customer data storage on session timeout "/>
16+
<description value="Verify customer data storage removal on session cookie timeout only"/>
17+
<severity value="CRITICAL"/>
18+
<testCaseId value="AC-2420"/>
19+
<group value="customer"/>
20+
</annotations>
21+
<before>
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
23+
<actionGroup ref="AdminNavigateToDefaultCookieSettingsActionGroup" stepKey="navigateToDefaultCookieSettingsPage"/>
24+
<actionGroup ref="AdminUncheckUseSystemValueActionGroup" stepKey="uncheckUseSystemValue">
25+
<argument name="rowId" value="row_web_cookie_cookie_lifetime"/>
26+
</actionGroup>
27+
<actionGroup ref="AdminFillCookieLifetimeActionGroup" stepKey="fillCookieLifetime">
28+
<argument name="cookieLifetime" value="15" />
29+
</actionGroup>
30+
<actionGroup ref="AdminClickFormActionButtonActionGroup" stepKey="clickSaveButtonWithString">
31+
<argument name="buttonSelector" value="{{AdminMainActionsSection.save}}"/>
32+
</actionGroup>
33+
<createData entity="John_Smith_Customer" stepKey="customer" />
34+
</before>
35+
<after>
36+
<actionGroup ref="AdminNavigateToDefaultCookieSettingsActionGroup" stepKey="navigateToDefaultCookieSettingsPage2"/>
37+
<actionGroup ref="AdminFillCookieLifetimeActionGroup" stepKey="fillCookieLifetimeFieldWithNumber">
38+
<argument name="cookieLifetime" value="3600"/>
39+
</actionGroup>
40+
<actionGroup ref="AdminCheckUseSystemValueActionGroup" stepKey="checkUseSystemValue">
41+
<argument name="rowId" value="row_web_cookie_cookie_lifetime"/>
42+
</actionGroup>
43+
<actionGroup ref="AdminClickFormActionButtonActionGroup" stepKey="clickSaveButton">
44+
<argument name="buttonSelector" value="{{AdminMainActionsSection.save}}"/>
45+
</actionGroup>
46+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAsAdmin" />
47+
</after>
48+
49+
<actionGroup ref="StorefrontOpenCustomerAccountCreatePageActionGroup" stepKey="openCreateAccountPage"/>
50+
<actionGroup ref="StorefrontFillCustomerAccountCreationFormActionGroup" stepKey="fillCreateAccountForm">
51+
<argument name="customer" value="John_Smith_Customer"/>
52+
</actionGroup>
53+
<actionGroup ref="StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup" stepKey="submitCreateAccountForm"/>
54+
<actionGroup ref="AssertMessageCustomerCreateAccountActionGroup" stepKey="seeSuccessMessage">
55+
<argument name="messageType" value="success"/>
56+
<argument name="message" value="Thank you for registering with Main Website Store."/>
57+
</actionGroup>
58+
<waitForPageLoad stepKey="waitForPageLoad"/>
59+
<see userInput="Welcome, {{John_Smith_Customer.fullname}}" selector="{{StorefrontPanelHeaderSection.welcomeMessage}}" stepKey="verifyMessage1"/>
60+
61+
<wait time="5" stepKey="waitSometime" />
62+
<reloadPage stepKey="refreshSessionCookieByPageRefresh" />
63+
<waitForPageLoad stepKey="waitForPageLoad2"/>
64+
<see userInput="Welcome, {{John_Smith_Customer.fullname}}" selector="{{StorefrontPanelHeaderSection.welcomeMessage}}" stepKey="verifyMessage2"/>
65+
66+
<wait time="7" stepKey="waitSometime2" />
67+
<reloadPage stepKey="refreshSessionCookieByPageRefresh2" />
68+
<waitForPageLoad stepKey="waitForPageLoad3"/>
69+
<see userInput="Welcome, {{John_Smith_Customer.fullname}}" selector="{{StorefrontPanelHeaderSection.welcomeMessage}}" stepKey="verifyMessage3"/>
70+
71+
<wait time="15" stepKey="waitSometime3" />
72+
<reloadPage stepKey="refreshSessionCookieByPageRefresh3" />
73+
<waitForPageLoad stepKey="waitForPageLoad4"/>
74+
<dontSee userInput="Welcome, {{John_Smith_Customer.fullname}}" selector="{{StorefrontPanelHeaderSection.welcomeMessage}}" stepKey="verifyMessage4"/>
75+
76+
<deleteData createDataKey="customer" stepKey="deleteCustomer" />
77+
</test>
78+
</tests>

‎app/code/Magento/Customer/view/frontend/web/js/customer-data.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,10 @@ define([
6666
*/
6767
invalidateCacheByCloseCookieSession = function () {
6868
if (!$.cookieStorage.isSet('mage-cache-sessid')) {
69-
$.cookieStorage.set('mage-cache-sessid', true);
7069
storage.removeAll();
7170
}
71+
72+
$.cookieStorage.set('mage-cache-sessid', true);
7273
};
7374

7475
dataProvider = {

0 commit comments

Comments
 (0)