Skip to content

Commit 5e88aa7

Browse files
slavvkaslavvka
authored
ENGCOM-7783: [MFTF] Use action group go to ProductCatalogPage #28941 
2 parents f8f1e5e + b6698f5 commit 5e88aa7

File tree

36 files changed

+78
-116
lines changed

36 files changed

+78
-116
lines changed

‎app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,7 @@
130130
<dontSeeElement stepKey="LookingForNameOfProductDisabled" selector="{{StorefrontBundledSection.bundleProductName}}"/>
131131

132132
<!--Enabling bundle products-->
133-
<amOnPage url="{{ProductCatalogPage.url}}" stepKey="GoToCatalogPageChangingView"/>
134-
<waitForPageLoad stepKey="WaitForPageToLoadFullyChangingView"/>
133+
<actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="goToCatalogPageChangingView"/>
135134
<click selector="{{AdminProductFiltersSection.allCheckbox}}" stepKey="ClickOnSelectAllCheckBoxChangingView"/>
136135
<click selector="{{AdminProductFiltersSection.actions}}" stepKey="ClickOnActionsChangingView"/>
137136
<click selector="{{AdminProductFiltersSection.changeStatus}}" stepKey="ClickOnChangeStatusChangingView"/>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductCatalogPageOpenActionGroup.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminProductCatalogPageOpenActionGroup">
12+
<annotations>
13+
<description>Goes to the Admin Product Catalog Page grid page.</description>
14+
</annotations>
15+
16+
<amOnPage url="{{ProductCatalogPage.url}}" stepKey="openProductCatalogPage"/>
17+
<waitForPageLoad stepKey="waitForProductCatalogPageLoad"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3232
</after>
3333

34-
<amOnPage url="{{ProductCatalogPage.url}}" stepKey="openProductCatalogPage"/>
35-
<waitForPageLoad stepKey="waitForProductCatalogPage"/>
34+
<actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
3635
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
3736
<waitForPageLoad stepKey="waitForProductToggleToSelectSimpleProduct"/>
3837
<click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickSimpleProductFromDropDownList"/>
@@ -49,8 +48,7 @@
4948
<see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
5049

5150
<!-- Search created simple product(from above step) in the grid page to verify sku masked as name and country of manufacture -->
52-
<amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchCreatedSimpleProduct"/>
53-
<waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
51+
<actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPageToSearchCreatedSimpleProduct"/>
5452
<conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
5553
<click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
5654
<fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.name}}-{{nameAndAttributeSkuMaskSimpleProduct.country_of_manufacture_label}}" stepKey="fillSkuFilterFieldWithNameAndCountryOfManufactureInput" />

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
2626
</after>
2727

28-
<amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
29-
<waitForPageLoad stepKey="waitForProductCatalogPage"/>
28+
<actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
3029
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
3130
<waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
3231
<click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
@@ -42,8 +41,7 @@
4241
<see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
4342

4443
<!-- Verify we see created virtual product(from the above step) on the product grid page -->
45-
<amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
46-
<waitForPageLoad stepKey="waitForProductCatalogPage1"/>
44+
<actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage1"/>
4745
<conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickSelector"/>
4846
<click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFilter"/>
4947
<fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{virtualProductWithRequiredFields.name}}" stepKey="fillProductName1"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3232
</after>
3333

34-
<amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
35-
<waitForPageLoad stepKey="waitForProductCatalogPage"/>
34+
<actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
3635
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
3736
<waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
3837
<click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3232
</after>
3333

34-
<amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
35-
<waitForPageLoad stepKey="waitForProductCatalogPage"/>
34+
<actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
3635
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
3736
<waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
3837
<click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
2828
</after>
2929

30-
<amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
31-
<waitForPageLoad stepKey="waitForProductCatalogPage"/>
30+
<actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
3231
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
3332
<waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
3433
<click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
@@ -60,8 +59,7 @@
6059
<!-- Verify we see success message -->
6160
<see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
6261

63-
<amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
64-
<waitForPageLoad stepKey="waitForProductCatalogPage1"/>
62+
<actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage1"/>
6563
<conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="checkRetailCustomerTaxClass" />
6664
<fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="{{virtualProductBigQty.name}}" stepKey="fillProductName1"/>
6765
<click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
2828
</after>
2929

30-
<amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
31-
<waitForPageLoad stepKey="waitForProductCatalogPage"/>
30+
<actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
3231
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
3332
<waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
3433
<click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2424
<!--Clear product grid-->
2525
<comment userInput="Clear product grid" stepKey="commentClearProductGrid"/>
26-
<amOnPage url="{{ProductCatalogPage.url}}" stepKey="goToProductCatalog"/>
27-
<waitForPageLoad stepKey="waitForProductIndexPage"/>
26+
<actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="goToProductCatalog"/>
2827
<actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridToDefaultView"/>
2928
<actionGroup ref="DeleteProductsIfTheyExistActionGroup" stepKey="deleteProductIfTheyExist"/>
3029
<createData stepKey="category1" entity="SimpleSubCategory"/>
@@ -37,8 +36,8 @@
3736
</createData>
3837
</before>
3938
<after>
40-
<amOnPage url="{{ProductCatalogPage.url}}" stepKey="goToProductCatalog"/>
41-
<waitForPageLoad stepKey="waitForProductIndexPage"/>
39+
40+
<actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="goToProductCatalog"/>
4241
<click selector="{{AdminDataGridPaginationSection.previousPage}}" stepKey="clickPrevPageOrderGrid"/>
4342
<actionGroup ref="AdminDataGridDeleteCustomPerPageActionGroup" stepKey="deleteCustomAddedPerPage">
4443
<argument name="perPage" value="ProductPerPage.productCount"/>
@@ -49,8 +48,7 @@
4948
<deleteData stepKey="deleteProduct2" createDataKey="product2"/>
5049
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
5150
</after>
52-
<amOnPage url="{{ProductCatalogPage.url}}" stepKey="goToProductCatalog"/>
53-
<waitForPageLoad stepKey="waitForProductIndexPage"/>
51+
<actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="goToProductCatalog"/>
5452
<actionGroup ref="AdminDataGridSelectCustomPerPageActionGroup" stepKey="select1OrderPerPage">
5553
<argument name="perPage" value="ProductPerPage.productCount"/>
5654
</actionGroup>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductNameToVerifyDataOverridingOnStoreViewLevelTest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@
4242
</after>
4343

4444
<!-- Search default simple product in grid -->
45-
<amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
46-
<waitForPageLoad stepKey="waitForProductCatalogPage"/>
45+
<actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
4746
<actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGrid">
4847
<argument name="sku" value="$$initialSimpleProduct.sku$$"/>
4948
</actionGroup>

0 commit comments

Comments
 (0)