From 1d704b64ed104ed2a6ea1c2ad1c898400b5d4533 Mon Sep 17 00:00:00 2001
From: Kate Kyzyma <kate@atwix.com>
Date: Fri, 5 Nov 2021 16:37:52 +0200
Subject: [PATCH] Refactoring-AdminCreateStoreViewTest

---
 .../Test/Mftf/Test/AdminCreateStoreViewTest.xml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml
index 9de820baa93bf..7637468d81e4b 100644
--- a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml
@@ -33,14 +33,19 @@
             </after>
 
             <!--Filter grid and see created store view-->
-            <actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="navigateToStoresIndex"/>
-            <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
-            <fillField selector="{{AdminStoresGridSection.storeFilterTextField}}" userInput="{{customStore.name}}" stepKey="fillStoreViewFilterField"/>
-            <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearch"/>
-            <see selector="{{AdminStoresGridSection.gridCell('1', 'Store View')}}" userInput="{{customStore.name}}" stepKey="seeNewStoreView"/>
+            <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="navigateToStoresIndex"/>
+            <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="resetSearchFilter"/>
+            <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="fillStoreViewFilterField"/>
+            <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickSearch"/>
+            <actionGroup ref="AssertStoreViewInGridActionGroup" stepKey="seeNewStoreView">
+                <argument name="storeViewName" value="{{customStore.name}}"/>
+            </actionGroup>
             <!--Try to create store view with the same code-->
             <actionGroup ref="AdminCreateStoreViewWithoutCheckActionGroup" stepKey="createSameStoreView"/>
             <dontSeeElement selector="{{AdminMessagesSection.success}}" stepKey="dontSeeSuccessMessage"/>
-            <see selector="{{AdminMessagesSection.error}}" userInput="Store with the same code already exists." stepKey="seeErrorMessage"/>
+            <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="seeErrorMessage">
+                <argument name="message" value="Store with the same code already exists."/>
+                <argument name="messageType" value="error" />
+            </actionGroup>
         </test>
 </tests>