Skip to content

Commit 33205df

Browse files
rimple-sainirimple-saini
committed
Merge remote-tracking branch 'origin/AC-2619' into gl_pr_arrows_april21_2022
2 parents 608507e + 3e07e0c commit 33205df

File tree

2 files changed

+109
-2
lines changed

2 files changed

+109
-2
lines changed

‎app/code/Magento/Persistent/Test/Mftf/Test/StorefrontVerifyShoppingCartPersistenceTest.xml

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
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="StorefrontVerifyShoppingCartPersistenceTest">
12+
<annotations>
13+
<features value="Persistent"/>
14+
<stories value="Shopping Cart Persistence"/>
15+
<title value="Verify Shopping Cart Persistence"/>
16+
<description value="Verify Shopping Cart Persistence"/>
17+
<severity value="CRITICAL"/>
18+
<testCaseId value="AC-2619"/>
19+
<group value="persistent"/>
20+
<group value="customer"/>
21+
</annotations>
22+
<before>
23+
<!--Enable Persistence-->
24+
<createData entity="PersistentConfigSettings" stepKey="persistentConfigSetting"/>
25+
<!--Create Simple Product 1 and Product 2 -->
26+
<createData entity="_defaultCategory" stepKey="createCategory"/>
27+
<createData entity="_defaultProduct" stepKey="createSimple1">
28+
<requiredEntity createDataKey="createCategory"/>
29+
</createData>
30+
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
31+
<actionGroup ref="AdminNavigateToDefaultCookieSettingsActionGroup" stepKey="navigateToDefaultCookieSettingsPage"/>
32+
<actionGroup ref="AdminUncheckUseSystemValueActionGroup" stepKey="uncheckUseSystemValue">
33+
<argument name="rowId" value="row_web_cookie_cookie_lifetime"/>
34+
</actionGroup>
35+
<actionGroup ref="AdminFillCookieLifetimeActionGroup" stepKey="fillCookieLifetime">
36+
<argument name="cookieLifetime" value="15" />
37+
</actionGroup>
38+
<actionGroup ref="AdminClickFormActionButtonActionGroup" stepKey="clickSaveButtonWithString">
39+
<argument name="buttonSelector" value="{{AdminMainActionsSection.save}}"/>
40+
</actionGroup>
41+
</before>
42+
<after>
43+
<!-- Set Defaults Persistence configuration-->
44+
<createData entity="PersistentConfigUseSystemValue" stepKey="persistentDefaultsConfiguration"/>
45+
<!--Delete Simple Product 1,customer and Category-->
46+
<deleteData createDataKey="createSimple1" stepKey="deleteSimple1"/>
47+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
48+
<actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteJohnSmithCustomer">
49+
<argument name="customerEmail" value="John_Smith_Customer.email"/>
50+
</actionGroup>
51+
<actionGroup ref="AdminNavigateToDefaultCookieSettingsActionGroup" stepKey="navigateToDefaultCookieSettingsPage2"/>
52+
<actionGroup ref="AdminFillCookieLifetimeActionGroup" stepKey="fillCookieLifetimeFieldWithNumber">
53+
<argument name="cookieLifetime" value="3600"/>
54+
</actionGroup>
55+
<actionGroup ref="AdminCheckUseSystemValueActionGroup" stepKey="checkUseSystemValue">
56+
<argument name="rowId" value="row_web_cookie_cookie_lifetime"/>
57+
</actionGroup>
58+
<actionGroup ref="AdminClickFormActionButtonActionGroup" stepKey="clickSaveButton">
59+
<argument name="buttonSelector" value="{{AdminMainActionsSection.save}}"/>
60+
</actionGroup>
61+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
62+
</after>
63+
64+
<!-- 1. Go to storefront and click the Create an Account link-->
65+
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="amOnHomePage"/>
66+
<click selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}" stepKey="clickCreateAnAccountLink" />
67+
<actionGroup ref="StorefrontAssertPersistentRegistrationPageFields" stepKey="assertPersistentRegistrationPageFields"/>
68+
69+
<!-- 2. Fill fields for registration, set password and select the Remember Me checkbox-->
70+
<actionGroup ref="StorefrontRegisterCustomerRememberMeActionGroup" stepKey="registrationJohnSmithCustomer">
71+
<argument name="Customer" value="John_Smith_Customer"/>
72+
</actionGroup>
73+
<!--Check customer name and last name in welcome message-->
74+
<actionGroup ref="AssertMessageCustomerCreateAccountActionGroup" stepKey="customerCreatedSuccessMessageForJohnSmith"/>
75+
<actionGroup ref="AssertCustomerWelcomeMessageActionGroup" stepKey="seeWelcomeMessageForJohnSmithCustomer">
76+
<argument name="customerFullName" value="{{John_Smith_Customer.fullname}}"/>
77+
</actionGroup>
78+
79+
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addSimple1ProductToCartForJohnSmithCustomer">
80+
<argument name="product" value="$$createSimple1$$"/>
81+
</actionGroup>
82+
<actionGroup ref="AssertOneProductNameInMiniCartActionGroup" stepKey="checkSimple1InMiniCartForJohnSmithCustomer">
83+
<argument name="productName" value="$$createSimple1.name$$"/>
84+
</actionGroup>
85+
86+
<wait time="15" stepKey="waitSometime3" />
87+
<reloadPage stepKey="refreshSessionCookieByPageRefresh3" />
88+
89+
<actionGroup ref="StorefrontAssertPersistentCustomerWelcomeMessageActionGroup" stepKey="seeWelcomeForJohnDoeCustomer">
90+
<argument name="customerFullName" value="{{John_Smith_Customer.fullname}}"/>
91+
</actionGroup>
92+
93+
<waitForElementVisible selector="{{StorefrontMinicartSection.productCount}}" stepKey="waitForCartCounterVisible"/>
94+
<see selector="{{StorefrontMinicartSection.productCount}}" userInput="1" stepKey="miniCartContainsOneProductForGuest"/>
95+
96+
<!-- 8. Go to Shopping Cart and verify Simple Product 1 is present there -->
97+
<actionGroup ref="ClickViewAndEditCartFromMiniCartActionGroup" stepKey="goToShoppingCart" />
98+
<see selector="{{CheckoutCartProductSection.productName}}" userInput="$$createSimple1.name$$" stepKey="checkSimple1InShoppingCart"/>
99+
100+
<actionGroup ref="AssertOneProductNameInMiniCartActionGroup" stepKey="checkSimple1InMiniCartForGuestCustomerSecondTime">
101+
<argument name="productName" value="$$createSimple1.name$$"/>
102+
</actionGroup>
103+
104+
</test>
105+
</tests>

‎app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ define([
1515
* Init.
1616
*/
1717
init: function () {
18-
var persistent = customerData.get('persistent');
18+
customerData.reload(['persistent','cart'], true);
19+
20+
let persistent = customerData.get('persistent');
1921

2022
if (persistent().fullname === undefined) {
2123
customerData.get('persistent').subscribe(this.replacePersistentWelcome);
@@ -28,7 +30,7 @@ define([
2830
* Replace welcome message for customer with persistent cookie.
2931
*/
3032
replacePersistentWelcome: function () {
31-
var persistent = customerData.get('persistent'),
33+
let persistent = customerData.get('persistent'),
3234
welcomeElems;
3335

3436
if (persistent().fullname !== undefined) {

0 commit comments

Comments
 (0)