MAGETWO-66666: Adding a product to cart from category page with an expired session does not allow product to be added

- Add automated test

Author: davgrigoryan1992

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

@@ -31,12 +31,7 @@
         <see userInput="You saved the product." stepKey="seeSaveConfirmation"/>
     </actionGroup>
 
-
     <actionGroup name="FindAndAddProductToCardActionGroup">
-        <arguments>
-            <argument name="product" defaultValue="SimpleProductOne"/>
-        </arguments>
-
         <click selector="{{StorefrontAddProductToCartSection.addToCartBtn}}" stepKey="addToCart"/>
         <waitForElementVisible selector="{{StorefrontProductPageSection.successMsg}}" time="30" stepKey="waitForProductAdded"/>
         <click selector="{{StorefrontAddProductToCartSection.showCard}}" stepKey="clickToOpenCard"/>
@@ -46,30 +41,20 @@
         <see userInput="Shipping Address" stepKey="seeShippingAddress"/>
     </actionGroup>
 
-
-    <actionGroup name="AgainGoToProductCategory">
-
-        <amOnPage url="/admin" stepKey="GoToDashboard"/>
-
-        <click selector="{{GoToProductPageSection.catalog}}" stepKey="clickOnCatalog" />
-        <waitForPageLoad stepKey="waitForPage"/>
-        <click selector="{{GoToProductPageSection.product}}" stepKey="clickToSelectProductsItem" />
-        <waitForPageLoad stepKey="waitForPageProducts"/>
-    </actionGroup>
-
     <actionGroup name="DeleteCreatedProduct">
-
-        <click selector="{{DeleteCreatedProduct.createdProductID(SimpleProductOne.name)}}" stepKey="selectCreatedProduct"/>
+        <fillField stepKey="searchToKeyword" selector="{{DeleteCreatedProduct.searchToKeyword}}" userInput="{{SimpleProductOne.name}}"/>
+        <click stepKey="clickSearchButton" selector="{{DeleteCreatedProduct.searchButton}}"/>
+        <wait stepKey="waitForFiltering" time="2"/>
+        <click selector="{{DeleteCreatedProduct.createdProductID}}" stepKey="selectCreatedProduct"/>
         <wait stepKey="waitSelectCreatedProduct" time="2"/>
         <waitForElementVisible selector="{{DeleteCreatedProduct.actionSelectBox}}" stepKey="waitToSelectActionVisible" time="50"/>
         <click stepKey="clickToSelectAction"  selector="{{DeleteCreatedProduct.actionSelectBox}}"/>
-        <wait stepKey="waitClickToSelectAction" time="2"/>
+        <waitForElementVisible selector="{{DeleteCreatedProduct.deleteButton}}" stepKey="waitForDeleteButtonAppeared" time="2"/>
         <click selector="{{DeleteCreatedProduct.deleteButton}}" stepKey="clickToDeleteProduct"/>
-        <wait stepKey="waitClickToDeleteProduct" time="2"/>
+        <waitForElementVisible selector="{{DeleteCreatedProduct.okButton}}" stepKey="waitForOkButtonAppeared" time="2"/>
         <click selector="{{DeleteCreatedProduct.okButton}}" stepKey="clickToConfirm"/>
-        <wait stepKey="waitClickToConfirmButton" time="2"/>
+        <wait stepKey="waitForRecordIsDeleted" time="2"/>
         <see userInput="A total of 1 record(s) have been deleted." stepKey="productDeletedSuccessfully"/>
-
     </actionGroup>
 
 </actionGroups>

app/code/Magento/Customer/Test/Mftf/Data/SimpleProductData.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="SimpleProductOne" type="product">
+        <data key="name" unique="suffix">testProduct</data>
+        <data key="sku" unique="suffix">testSku</data>
+        <data key="price">200</data>
+        <data key="quantity">100</data>
+        <data key="urlKey" unique="suffix">testProduct</data>
+    </entity>
+</entities>

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

@@ -13,7 +13,6 @@
         <element name="successMsg" type="button" selector="div.message-success"/>
         <element name="showCard" type="button" selector=".action.showcart"/>
         <element name="proceed" type="button" selector="#top-cart-btn-checkout"/>
-
     </section>
 
     <section name="GoToProductPageSection">
@@ -59,13 +58,14 @@
         <element name="searchOptimization" type="button" selector="//*[contains(text(),'Search Engine Optimization')]"/>
         <element name="urlKey" type="input" selector="//input[contains(@name,'url_key')]"/>
         <element name="saveButton" type="button" selector="#save-button"/>
-
     </section>
 
     <section name="DeleteCreatedProduct">
-        <element name="createdProductID" type="select" selector="//*[@id='container']//*[text()='{{arg1}}']/parent::td/parent::tr//label[contains(@class, 'data-grid-checkbox-cell-inner')]" parameterized="true"/>
-        <element name="actionSelectBox" type="button" selector="//*[@class='col-xs-2']"/>
-        <element name="deleteButton" type="button" selector="//*[@class='admin__data-grid-header-row row row-gutter']//*[text()='Delete']"/>
+        <element name="searchToKeyword" type="input" selector="//*[@class='admin__data-grid-outer-wrap']/*[@class='admin__data-grid-header']//*[@class='data-grid-search-control-wrap']/input"/>
+        <element name="searchButton" type="button" selector="//*[@class='admin__data-grid-outer-wrap']/*[@class='admin__data-grid-header']//*[@class='data-grid-search-control-wrap']/button"/>
+        <element name="createdProductID" type="select" selector="//*[@class='data-grid-checkbox-cell-inner']/input"/>
+        <element name="actionSelectBox" type="button" selector="//*[@class='col-xs-2']//span[text()='Actions']"/>
+        <element name="deleteButton" type="button" selector="//div[@class='col-xs-2']//*[text()='Delete']"/>
         <element name="okButton" type="button" selector=".action-primary.action-accept"/>
     </section>
 

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

@@ -40,8 +40,8 @@
 
         <after>
             <!--Delete created product-->
-            <actionGroup ref="AgainGoToProductCategory" stepKey="againGoToProductCategory"/>
-            <wait stepKey="waitForProductPageLoaded" time="3"/>
+            <amOnPage url="/admin" stepKey="GoToDashboard"/>
+            <actionGroup ref="GoToProductPage" stepKey="againGoToProductPage"/>
             <actionGroup ref="DeleteCreatedProduct" stepKey="deleteCreatedProduct"/>
         </after>