From e6bbe445f36cf39bc1bd48d98b6794b643615c7d Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Mon, 3 Jan 2022 17:00:18 +0200
Subject: [PATCH] replaced by action group

---
 .../AdminGridPageNumberAfterSaveAndCloseActionTest.xml    | 4 +++-
 .../Magento/Sales/Test/Mftf/Test/EndToEndB2CAdminTest.xml | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml
index f10288bea36d9..f9268a86b57ce 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml
@@ -61,6 +61,8 @@
         </actionGroup>
         <actionGroup ref="AdminFormSaveAndCloseActionGroup" stepKey="saveAndCloseProduct"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
-        <seeInField selector="{{AdminDataGridPaginationSection.currentPage}}" userInput="2" stepKey="seeOnSecondPageOrderGrid"/>
+        <actionGroup ref="AdminGridAssertCurrentPageNumberActionGroup" stepKey="seeOnSecondPageOrderGrid">
+            <argument name="expectedCurrentPageNumber" value="2"/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/EndToEndB2CAdminTest.xml
index d0bf3958179d4..aa43af0754094 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/EndToEndB2CAdminTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/EndToEndB2CAdminTest.xml
@@ -258,9 +258,13 @@
             <argument name="perPage" value="Const.one"/>
         </actionGroup>
         <seeNumberOfElements selector="{{AdminDataGridTableSection.rows}}" userInput="1" stepKey="see1RowOnFirstPage" after="select1OrderPerPage"/>
-        <seeInField selector="{{AdminDataGridPaginationSection.currentPage}}" userInput="1" stepKey="seeOnFirstPageOrderGrid" after="see1RowOnFirstPage"/>
+        <actionGroup ref="AdminGridAssertCurrentPageNumberActionGroup" stepKey="seeOnFirstPageOrderGrid" after="see1RowOnFirstPage">
+            <argument name="expectedCurrentPageNumber" value="1"/>
+        </actionGroup>
         <click selector="{{AdminDataGridPaginationSection.nextPage}}" stepKey="clickNextPageOrderGrid" after="seeOnFirstPageOrderGrid"/>
-        <seeInField selector="{{AdminDataGridPaginationSection.currentPage}}" userInput="2" stepKey="seeOnSecondPageOrderGrid" after="clickNextPageOrderGrid"/>
+        <actionGroup ref="AdminGridAssertCurrentPageNumberActionGroup" stepKey="seeOnSecondPageOrderGrid" after="clickNextPageOrderGrid">
+            <argument name="expectedCurrentPageNumber" value="2"/>
+        </actionGroup>
         <seeNumberOfElements selector="{{AdminDataGridTableSection.rows}}" userInput="1" stepKey="see1RowOnSecondPage" after="seeOnSecondPageOrderGrid"/>
         <actionGroup ref="AdminDataGridSelectPerPageActionGroup" stepKey="select50OrdersPerPage" after="see1RowOnSecondPage">
             <!--@TODO Change this to scalar when MQE-498 is implemented-->