MC-10263: Verify Shopping Cart Persistence under long-term cookie

Author: oleg-onufer

app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml

@@ -35,6 +35,6 @@
         <element name="productPriceByName" type="text"
                  selector="//table[@id='shopping-cart-table']//tbody//tr[//a/text()='{{var1}}']//ancestor::td[contains(@class,'price')]//span[@class='price']"
                  parameterized="true"/>
-        <element name="productName" type="text" selector="//tbody[@class='cart item']//strong[@class='product-item-name']"/>
+        <element name="productName" type="text" selector="#shopping-cart-table .product-item-details > strong"/>
     </section>
 </sections>

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

@@ -9,16 +9,16 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminDeleteCustomerActionGroup">
         <arguments>
-            <argument name="customerEmail"/>
+            <argument name="customerEmail" type="string"/>
         </arguments>
         <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomersPage"/>
         <conditionalClick selector="{{AdminCustomerFiltersSection.clearFilters}}" dependentSelector="{{AdminCustomerFiltersSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
-        <click selector="{{AdminCustomerGridMainActionsSection.customerCheckbox(customerEmail)}}" stepKey="chooseCustomer"/>
-        <click selector="{{AdminCustomerGridMainActionsSection.actions}}" stepKey="openActions"/>
-        <waitForPageLoad stepKey="waitActions"/>
-        <click selector="{{AdminCustomerGridMainActionsSection.delete}}" stepKey="delete"/>
-        <waitForPageLoad stepKey="waitForConfirmationAlert"/>
+        <click selector="{{AdminGridActionsMenuSection.checkbox(customerEmail)}}" stepKey="chooseCustomer"/>
+        <click selector="{{AdminGridActionsMenuSection.actions}}" stepKey="openActions"/>
+        <click selector="{{AdminGridActionsMenuSection.delete}}" stepKey="delete"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForElementVisible"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="accept"/>
-        <see  selector="{{AdminMessagesSection.successMessage}}" userInput="were deleted." stepKey="seeSuccessMessage"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="were deleted." stepKey="seeSuccessMessage"/>
     </actionGroup>
 </actionGroups>

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

@@ -11,8 +11,7 @@
     <actionGroup name="StorefrontAssertMessageCustomerCreateAccountActionGroup">
         <arguments>
             <argument name="message" type="string" defaultValue="Thank you for registering with Main Website Store." />
-            <argument name="messageType" type="string" defaultValue="success" />
         </arguments>
-        <see selector="{{StorefrontCustomerDashboardAccountInformationSection.messageByType(messageType)}}" userInput="{{message}}" stepKey="verifyMessage" />
+        <see selector="{{StorefrontMessagesSection.successMessage}}" userInput="{{message}}" stepKey="verifyMessage" />
     </actionGroup>
 </actionGroups>

app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml

@@ -10,8 +10,5 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCustomerGridMainActionsSection">
         <element name="addNewCustomer" type="button" selector="#add" timeout="30"/>
-        <element name="delete" type="button" selector="//*[contains(@class, 'admin__data-grid-header')]//span[contains(@class,'action-menu-item') and text()='Delete']"/>
-        <element name="actions" type="text" selector=".action-select"/>
-        <element name="customerCheckbox" type="button" selector="//*[contains(text(),'{{customerEmail}}')]/parent::td/preceding-sibling::td/label[@class='data-grid-checkbox-cell-inner']//input" parameterized="true"/>
     </section>
 </sections>

app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerDashboardAccountInformationSection.xml

@@ -10,6 +10,5 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerDashboardAccountInformationSection">
         <element name="ContactInformation" type="textarea" selector=".box.box-information .box-content"/>
-        <element name="messageByType" type="block" selector="#maincontent .message-{{messageType}}" parameterized="true" />
     </section>
 </sections>

app/code/Magento/Persistent/Test/Mftf/Test/StorefrontVerifyShoppingCartPersistenceUnderLongTermCookieTest.xml

@@ -40,10 +40,10 @@
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
             <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteJohnSmithCustomer">
-                <argument name="customerEmail" value="John_Smith_Customer.email"/>
+                <argument name="customerEmail" value="{{John_Smith_Customer.email}}"/>
             </actionGroup>
             <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteJohnDoeCustomer">
-                <argument name="customerEmail" value="Simple_Customer_Without_Address.email"/>
+                <argument name="customerEmail" value="{{Simple_Customer_Without_Address.email}}"/>
             </actionGroup>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>

app/code/Magento/Ui/Test/Mftf/Section/AdminGridActionsMenuSection.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminGridActionsMenuSection">
+        <element name="delete" type="button" selector="//*[contains(@class, 'row-gutter')]//span[contains(@class,'action-menu-item') and text()='Delete']" timeout="30"/>
+        <element name="actions" type="text" selector=".row-gutter .action-select" timeout="30"/>
+        <element name="checkbox" type="checkbox" selector="//*[contains(text(),'{{columnValue}}')]/parent::td/preceding-sibling::td/label[@class='data-grid-checkbox-cell-inner']//input" parameterized="true"/>
+    </section>
+</sections>