From 4ec730cc0cabc4a55e5e7bf1ab99496178deeae1 Mon Sep 17 00:00:00 2001
From: David Grigoryan <david_grigoryan@epam.com>
Date: Tue, 14 Aug 2018 18:44:11 +0400
Subject: [PATCH] MAGETWO-66666: Adding a product to cart from category page
 with an expired session does not allow product to be added

- Updated automated test
---
 .../StorefrontAddProductToCardActionGroup.xml         | 11 +++++++----
 .../Section/StorefrontAddProductToCardSection.xml     |  3 +++
 .../Mftf/Test/AddingProductWithExpiredSessionTest.xml |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAddProductToCardActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAddProductToCardActionGroup.xml
index 71919d9da37de..49edf529a188d 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAddProductToCardActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAddProductToCardActionGroup.xml
@@ -41,10 +41,13 @@
         <see userInput="Shipping Address" stepKey="seeShippingAddress"/>
     </actionGroup>
 
-    <actionGroup name="DeleteCreatedProduct">
-        <fillField stepKey="searchToKeyword" selector="{{DeleteCreatedProduct.searchToKeyword}}" userInput="{{SimpleProductOne.name}}"/>
-        <click stepKey="clickSearchButton" selector="{{DeleteCreatedProduct.searchButton}}"/>
-        <wait stepKey="waitForFiltering" time="2"/>
+    <actionGroup name="DeleteCreatedProductActionGroup">
+        <conditionalClick selector="{{DeleteCreatedProduct.clearAll}}" dependentSelector="{{DeleteCreatedProduct.clearAll}}" visible="1" stepKey="clickClearAllIfThereIsAnyValue"/>
+        <click stepKey="clickFilterButton" selector="{{DeleteCreatedProduct.filterButton}}"/>
+        <waitForElementVisible selector="{{DeleteCreatedProduct.filterSKUField}}" stepKey="waitForFilterDataLoaded"/>
+        <fillField stepKey="searchProductUsingSKUField" selector="{{DeleteCreatedProduct.filterSKUField}}" userInput="{{SimpleProductOne.sku}}"/>
+        <click stepKey="clickFiltersApplyButton" selector="{{DeleteCreatedProduct.filtersApplyButton}}"/>
+        <waitForElementNotVisible selector="{{DeleteCreatedProduct.filterSKUField}}" stepKey="waitForFilterBecomeNotVisible"/>
         <click selector="{{DeleteCreatedProduct.createdProductID}}" stepKey="selectCreatedProduct"/>
         <wait stepKey="waitSelectCreatedProduct" time="2"/>
         <waitForElementVisible selector="{{DeleteCreatedProduct.actionSelectBox}}" stepKey="waitToSelectActionVisible" time="50"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontAddProductToCardSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontAddProductToCardSection.xml
index 868a47a26f42b..cc0cf8e07008e 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontAddProductToCardSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontAddProductToCardSection.xml
@@ -68,6 +68,9 @@
         <element name="deleteButton" type="button" selector="//div[@class='col-xs-2']//*[text()='Delete']"/>
         <element name="okButton" type="button" selector=".action-primary.action-accept"/>
         <element name="clearAll" type="button" selector="//*[@class='admin__data-grid-outer-wrap']/*[@class='admin__data-grid-header']//*[contains(text(), 'Clear all')]"/>
+        <element name="filterButton" type="button" selector="//*[@class='admin__data-grid-outer-wrap']/*[@class='admin__data-grid-header']//*[@class='data-grid-filters-action-wrap']/button"/>
+        <element name="filterSKUField" type="input" selector="//*[@name='sku']"/>
+        <element name="filtersApplyButton" type="button" selector="//*[contains(text(),'Apply Filters')]"/>
     </section>
 
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AddingProductWithExpiredSessionTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AddingProductWithExpiredSessionTest.xml
index 058b5b5c18bfd..b8abda3b37de6 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AddingProductWithExpiredSessionTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AddingProductWithExpiredSessionTest.xml
@@ -42,7 +42,7 @@
             <!--Delete created product-->
             <amOnPage url="/admin" stepKey="GoToDashboard"/>
             <actionGroup ref="GoToProductPage" stepKey="againGoToProductPage"/>
-            <actionGroup ref="DeleteCreatedProduct" stepKey="deleteCreatedProduct"/>
+            <actionGroup ref="DeleteCreatedProductActionGroup" stepKey="deleteCreatedProduct"/>
         </after>
 
     </test>