Skip to content

Commit 0262f14

Browse files
lbajsarowiczlbajsarowicz
committed
REFACTOR: Extract Action Groups to separate files (according to MFTF best practices)
1 parent c7ca62e commit 0262f14

File tree

644 files changed

+6491
-4779
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

644 files changed

+6491
-4779
lines changed

‎app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsChart.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<comment userInput="Add product to the shopping cart" stepKey="addProductToCart"/>
5555
<amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToSimpleProductPage"/>
5656
<waitForPageLoad stepKey="waitForProductPageLoad"/>
57-
<actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
57+
<actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
5858
<argument name="productName" value="$$createProduct.name$$"/>
5959
</actionGroup>
6060
<!--Go to Checkout-->

‎app/code/Magento/Braintree/Test/Mftf/Test/CretateAdminOrderWithOnlinePaymentIncludingTaxAndDiscount.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<!--Adding Special price to product-->
9696
<amOnPage url="{{AdminProductEditPage.url($$simpleProduct.id$$)}}" stepKey="openAdminProductEditPage"/>
9797
<actionGroup ref="AddSpecialPriceToProductActionGroup" stepKey="addSpecialPrice"/>
98-
<actionGroup ref="saveProductForm" stepKey="saveProductForm"/>
98+
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveProductForm"/>
9999

100100
<!--Create New Order-->
101101
<actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@
5151
<waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
5252
<click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
5353
<waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
54-
<actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions">
54+
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions">
5555
<argument name="product" value="$$simpleProduct0$$"/>
5656
</actionGroup>
5757
<checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow"/>
58-
<actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions2">
58+
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions2">
5959
<argument name="product" value="$$simpleProduct1$$"/>
6060
</actionGroup>
6161
<checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow2"/>
@@ -91,7 +91,7 @@
9191
<waitForPageLoad stepKey="WaitForPageToLoad"/>
9292
<conditionalClick selector="{{AdminProductFiltersSection.filtersClear}}" dependentSelector="{{AdminProductFiltersSection.filtersClear}}" visible="true" stepKey="ClickOnButtonToRemoveFiltersIfPresent"/>
9393
<waitForPageLoad stepKey="WaitForClear"/>
94-
<actionGroup ref="filterProductGridByName" stepKey="filterBundleProductOptionsDownToName">
94+
<actionGroup ref="FilterProductGridByNameActionGroup" stepKey="filterBundleProductOptionsDownToName">
9595
<argument name="product" value="BundleProduct"/>
9696
</actionGroup>
9797
<click selector="{{AdminProductFormBundleSection.addOptions}}" stepKey="clickOnBundleProductToEdit"/>
@@ -103,11 +103,11 @@
103103
<waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToNewBundle"/>
104104
<click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToNewOption"/>
105105
<waitForPageLoad stepKey="waitForPageLoadAfterNewBundleProducts"/>
106-
<actionGroup ref="filterProductGridBySku" stepKey="filterNewBundleProductOptions">
106+
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterNewBundleProductOptions">
107107
<argument name="product" value="$$simpleProduct2$$"/>
108108
</actionGroup>
109109
<checkOption selector="//div[@class='admin__data-grid-outer-wrap']//tr[@data-repeat-index='0']//input[@type='checkbox']" stepKey="selectNewFirstGridRow"/>
110-
<actionGroup ref="filterProductGridBySku" stepKey="filterNewBundleProductOptions2">
110+
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterNewBundleProductOptions2">
111111
<argument name="product" value="$$simpleProduct3$$"/>
112112
</actionGroup>
113113
<checkOption selector="{{AdminProductFormBundleSection.firstProductOption}}" stepKey="selectNewFirstGridRow2"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<requiredEntity createDataKey="createSimpleProduct2"/>
5252
</createData>
5353
<amOnPage url="{{AdminProductEditPage.url($$createProduct.id$$)}}" stepKey="goToProductEditPage"/>
54-
<actionGroup ref="saveProductForm" stepKey="saveProduct"/>
54+
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
5555
</before>
5656
<after>
5757
<!-- Delete created data -->

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
<!-- Create a bundle product -->
3333
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageBundle"/>
3434
<waitForPageLoad stepKey="waitForProductPageLoadBundle"/>
35-
<actionGroup ref="goToCreateProductPage" stepKey="goToCreateBundleProduct">
35+
<actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateBundleProduct">
3636
<argument name="product" value="BundleProduct"/>
3737
</actionGroup>
3838

39-
<actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillBundleProductNameAndSku">
39+
<actionGroup ref="FillProductNameAndSkuInProductFormActionGroup" stepKey="fillBundleProductNameAndSku">
4040
<argument name="product" value="BundleProduct"/>
4141
</actionGroup>
4242

@@ -51,11 +51,11 @@
5151
<waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
5252
<click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
5353
<waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
54-
<actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions">
54+
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions">
5555
<argument name="product" value="$$simpleProduct1$$"/>
5656
</actionGroup>
5757
<checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow"/>
58-
<actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions2">
58+
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions2">
5959
<argument name="product" value="$$simpleProduct2$$"/>
6060
</actionGroup>
6161
<checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow2"/>
@@ -64,23 +64,23 @@
6464
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty2"/>
6565

6666
<!-- Add image to product -->
67-
<actionGroup ref="addProductImage" stepKey="addImageForProduct">
67+
<actionGroup ref="AddProductImageActionGroup" stepKey="addImageForProduct">
6868
<argument name="image" value="MagentoLogo"/>
6969
</actionGroup>
7070

7171
<!--Save product-->
72-
<actionGroup ref="saveProductForm" stepKey="saveProduct"/>
72+
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
7373

7474
<!-- Assert product image in admin product form -->
75-
<actionGroup ref="assertProductImageAdminProductPage" stepKey="assertProductImageAdminProductPage"/>
75+
<actionGroup ref="AssertProductImageAdminProductPageActionGroup" stepKey="assertProductImageAdminProductPage"/>
7676

7777
<!-- Assert product in storefront product page -->
78-
<actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
78+
<actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageActionGroup" stepKey="AssertProductInStorefrontProductPage">
7979
<argument name="product" value="BundleProduct"/>
8080
</actionGroup>
8181

8282
<!-- Assert product image in storefront product page -->
83-
<actionGroup ref="assertProductImageStorefrontProductPage" stepKey="assertProductImageStorefrontProductPage">
83+
<actionGroup ref="AssertProductImageStorefrontProductPageActionGroup" stepKey="assertProductImageStorefrontProductPage">
8484
<argument name="product" value="BundleProduct"/>
8585
<argument name="image" value="MagentoLogo"/>
8686
</actionGroup>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929

3030
<!-- Create a bundle product -->
3131
<!-- Replacing steps in base AdminAddDefaultVideoSimpleProductTest -->
32-
<actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
32+
<actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProductPage">
3333
<argument name="product" value="BundleProduct"/>
3434
</actionGroup>
35-
<actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillMainProductForm">
35+
<actionGroup ref="FillProductNameAndSkuInProductFormActionGroup" stepKey="fillMainProductForm">
3636
<argument name="product" value="BundleProduct"/>
3737
</actionGroup>
3838

@@ -46,11 +46,11 @@
4646
<waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProducts" after="selectOptionBundleTitle"/>
4747
<click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProducts" after="waitForAddProducts"/>
4848
<waitForPageLoad stepKey="waitForPageLoad" after="clickAddProducts"/>
49-
<actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku1" after="waitForPageLoad">
49+
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProductGridBySku1" after="waitForPageLoad">
5050
<argument name="product" value="$$simpleProduct1$$"/>
5151
</actionGroup>
5252
<checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="checkOption1" after="filterProductGridBySku1"/>
53-
<actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku2" after="checkOption1">
53+
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProductGridBySku2" after="checkOption1">
5454
<argument name="product" value="$$simpleProduct2$$"/>
5555
</actionGroup>
5656
<checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="checkOption2" after="filterProductGridBySku2"/>
@@ -59,7 +59,7 @@
5959
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillQty2" before="saveProductForm"/>
6060

6161
<!-- Assert product in storefront product page -->
62-
<actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
62+
<actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageActionGroup" stepKey="AssertProductInStorefrontProductPage">
6363
<argument name="product" value="BundleProduct"/>
6464
</actionGroup>
6565
</test>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@
7979
<argument name="websiteName" value="{{secondCustomWebsite.name}}"/>
8080
</actionGroup>
8181

82-
<actionGroup ref="NavigateToAndResetProductGridToDefaultView" stepKey="resetProductGridFilter"/>
82+
<actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridFilter"/>
8383

8484
<!-- Admin logout -->
8585
<actionGroup ref="logout" stepKey="adminLogout"/>
8686
</after>
8787

8888
<!-- Open product page and assign grouped project to second website -->
89-
<actionGroup ref="filterAndSelectProduct" stepKey="openAdminProductPage">
89+
<actionGroup ref="FilterAndSelectProductActionGroup" stepKey="openAdminProductPage">
9090
<argument name="productSku" value="$$createBundleProduct.sku$$"/>
9191
</actionGroup>
9292
<actionGroup ref="AdminAssignProductInWebsiteActionGroup" stepKey="assignProductToSecondWebsite">
@@ -95,15 +95,15 @@
9595
<actionGroup ref="AdminUnassignProductInWebsiteActionGroup" stepKey="unassignProductFromDefaultWebsite">
9696
<argument name="website" value="{{_defaultWebsite.name}}"/>
9797
</actionGroup>
98-
<actionGroup ref="saveProductForm" stepKey="saveGroupedProduct"/>
98+
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveGroupedProduct"/>
9999

100100
<!-- Assert product is assigned to Second website -->
101-
<actionGroup ref="AssertProductIsAssignedToWebsite" stepKey="seeCustomWebsiteIsChecked">
101+
<actionGroup ref="AssertProductIsAssignedToWebsiteActionGroup" stepKey="seeCustomWebsiteIsChecked">
102102
<argument name="website" value="{{secondCustomWebsite.name}}"/>
103103
</actionGroup>
104104

105105
<!-- Assert product is not assigned to Main website -->
106-
<actionGroup ref="AssertProductIsNotAssignedToWebsite" stepKey="seeMainWebsiteIsNotChecked">
106+
<actionGroup ref="AssertProductIsNotAssignedToWebsiteActionGroup" stepKey="seeMainWebsiteIsNotChecked">
107107
<argument name="website" value="{{_defaultWebsite.name}}"/>
108108
</actionGroup>
109109

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<!--Set filter to product name-->
5757
<amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage"/>
5858
<waitForPageLoad stepKey="WaitForPageToLoad"/>
59-
<actionGroup ref="filterProductGridByName" stepKey="filterBundleProductOptionsDownToName">
59+
<actionGroup ref="FilterProductGridByNameActionGroup" stepKey="filterBundleProductOptionsDownToName">
6060
<argument name="product" value="BundleProduct"/>
6161
</actionGroup>
6262
<seeElement selector="{{AdminProductFiltersSection.attributeSetOfFirstRow(ProductAttributeFrontendLabel.label)}}" stepKey="seeAttributeSet"/>
@@ -77,7 +77,7 @@
7777
<!--Set filter to product name-->
7878
<amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage2"/>
7979
<waitForPageLoad stepKey="WaitForPageToLoad2"/>
80-
<actionGroup ref="filterProductGridByName" stepKey="filterBundleProductOptionsDownToName2">
80+
<actionGroup ref="FilterProductGridByNameActionGroup" stepKey="filterBundleProductOptionsDownToName2">
8181
<argument name="product" value="BundleProduct"/>
8282
</actionGroup>
8383
<seeElement selector="{{AdminProductFiltersSection.attributeSetOfFirstRow(BundleProduct.defaultAttribute)}}" stepKey="seeAttributeSet2"/>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
2525
</after>
2626
<!--Create attribute set-->
27-
<actionGroup ref="CreateDefaultAttributeSet" stepKey="createDefaultAttributeSet">
27+
<actionGroup ref="CreateDefaultAttributeSetActionGroup" stepKey="createDefaultAttributeSet">
2828
<argument name="label" value="{{ProductAttributeFrontendLabel.label}}"/>
2929
</actionGroup>
3030

@@ -91,14 +91,14 @@
9191
<seeOptionIsSelected selector="{{AdminProductFormBundleSection.countryOfManufactureDropDown}}" userInput="Italy" stepKey="seeCountryOfManufacture"/>
9292

9393
<!--Create second attribute set for edit-->
94-
<actionGroup ref="CreateDefaultAttributeSet" stepKey="createSecondAttributeSet">
94+
<actionGroup ref="CreateDefaultAttributeSetActionGroup" stepKey="createSecondAttributeSet">
9595
<argument name="label" value="{{ProductAttributeFrontendLabelTwo.label}}"/>
9696
</actionGroup>
9797

9898
<!--Filter catalog-->
9999
<amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="goToCatalogProductPage"/>
100100
<waitForPageLoad stepKey="WaitForPageToLoad"/>
101-
<actionGroup ref="filterProductGridByName" stepKey="filterBundleProductOptionsDownToName">
101+
<actionGroup ref="FilterProductGridByNameActionGroup" stepKey="filterBundleProductOptionsDownToName">
102102
<argument name="product" value="BundleProduct"/>
103103
</actionGroup>
104104
<click selector="{{AdminProductFiltersSection.attributeSetOfFirstRow(ProductAttributeFrontendLabel.label)}}" stepKey="clickAttributeSet2"/>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@
2121
</annotations>
2222
<after>
2323
<!-- Delete bundle product -->
24-
<actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
24+
<actionGroup ref="DeleteProductUsingProductGridActionGroup" stepKey="deleteProduct">
2525
<argument name="product" value="BundleProduct"/>
2626
</actionGroup>
2727
</after>
2828

2929
<!-- Create product -->
30-
<actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
30+
<actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProduct">
3131
<argument name="product" value="BundleProduct"/>
3232
</actionGroup>
33-
<actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillProductForm">
33+
<actionGroup ref="FillProductNameAndSkuInProductFormActionGroup" stepKey="fillProductForm">
3434
<argument name="product" value="BundleProduct"/>
3535
</actionGroup>
3636

0 commit comments

Comments
 (0)