From 9972de05b32557998674a528c7b32c3f82dde0b5 Mon Sep 17 00:00:00 2001
From: Kate Kyzyma <kate@atwix.com>
Date: Fri, 22 Oct 2021 16:09:17 +0300
Subject: [PATCH 1/3] Reusing existing ActionGroup

---
 .../Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml
index a34712397e830..2c2085f935e7b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml
@@ -36,6 +36,9 @@
         </actionGroup>
 
         <!-- Assert error message -->
-        <see selector="{{AdminCategoryMessagesSection.errorMessage}}" userInput="The value specified in the URL Key field would generate a URL that already exists." stepKey="seeErrorMessage"/>
+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertErrorMessage">
+            <argument name="messageType" value="error"/>
+            <argument name="message" value="The value specified in the URL Key field would generate a URL that already exists."/>
+        </actionGroup>
     </test>
 </tests>

From c934b510419356b9e369c185bb3b69d055e18897 Mon Sep 17 00:00:00 2001
From: Kate Kyzyma <kate@atwix.com>
Date: Fri, 22 Oct 2021 16:17:20 +0300
Subject: [PATCH 2/3] Refactoring-AdminCreateDuplicateProductTest

---
 .../Test/Mftf/Test/AdminCreateDuplicateProductTest.xml       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml
index cc76304bc5ebc..6920d84871c11 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml
@@ -57,6 +57,9 @@
 
         <!-- Save the product and expect to see an error message -->
         <actionGroup ref="SaveProductFormNoSuccessCheckActionGroup" stepKey="tryToSaveProduct"/>
-        <see selector="{{AdminProductFormSection.successMessage}}"  userInput="The value specified in the URL Key field would generate a URL that already exists." stepKey="seeErrorMessage"/>
+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="seeErrorMessage">
+            <argument name="messageType" value="error"/>
+            <argument name="message" value="The value specified in the URL Key field would generate a URL that already exists."/>
+        </actionGroup>
     </test>
 </tests>

From 1faca0100ff04513e1c306454c02d703890d7af1 Mon Sep 17 00:00:00 2001
From: Kate Kyzyma <kate@atwix.com>
Date: Mon, 25 Oct 2021 09:43:47 +0300
Subject: [PATCH 3/3] Change stepKey

---
 .../Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml
index 2c2085f935e7b..e53e5881861eb 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml
@@ -36,7 +36,7 @@
         </actionGroup>
 
         <!-- Assert error message -->
-        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertErrorMessage">
+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="seeErrorMessage">
             <argument name="messageType" value="error"/>
             <argument name="message" value="The value specified in the URL Key field would generate a URL that already exists."/>
         </actionGroup>