Skip to content

Commit f6df6cd

Browse files
VladimirZaetsVladimirZaets
committed
Change action groups name according to CE branch changes
1 parent 193bce2 commit f6df6cd

9 files changed

+34
-24
lines changed

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

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,15 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="DeleteProductAttributeByAttributeCodeActionGroup">
1212
<annotations>
13-
<description>Goes to the Admin Product Attributes grid page. Filters the grid for the provided Product Attribute Code. Deletes the Product Attribute from the grid. Validates that the Success Message is present.</description>
13+
<description>Delete a Product Attribute from the Product Attribute creation/edit page.</description>
1414
</annotations>
1515
<arguments>
16-
<argument name="ProductAttributeCode" type="string"/>
16+
<argument name="productAttributeCode" type="string"/>
1717
</arguments>
1818

19-
<amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
20-
<waitForPageLoad stepKey="waitForAttributeGridPageLoad"/>
21-
<fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="{{ProductAttributeCode}}" stepKey="setAttributeCode"/>
22-
<click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
23-
<click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="clickOnAttributeRow"/>
24-
<waitForPageLoad stepKey="waitForPageLoad2"/>
19+
<waitForPageLoad stepKey="waitForViewAdminProductAttributeLoad" time="30"/>
2520
<click selector="{{AttributePropertiesSection.DeleteAttribute}}" stepKey="deleteAttribute"/>
26-
<click selector="{{ModalConfirmationSection.OkButton}}" stepKey="ClickOnDeleteButton"/>
27-
<waitForPageLoad stepKey="waitForPageLoad"/>
28-
<seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="waitForSuccessMessage"/>
21+
<click selector="{{ModalConfirmationSection.OkButton}}" stepKey="clickOnConfirmOk"/>
22+
<waitForPageLoad stepKey="waitForViewProductAttributePageLoad"/>
2923
</actionGroup>
3024
</actionGroups>

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,11 @@
4949
<waitForPageLoad stepKey="waitForPageToSave"/>
5050
<see userInput="You saved the attribute set" selector="{{AdminMessagesSection.success}}" stepKey="successMessage"/>
5151
<!--Delete product attribute from product attribute grid -->
52-
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttribute">
53-
<argument name="ProductAttributeCode" value="$$attribute.attribute_code$$"/>
52+
<actionGroup ref="OpenProductAttributeFromSearchResultInGridActionGroup" stepKey="openProductAttributeFromSearchResultInGrid">
53+
<argument name="productAttributeCode" value="$$attribute.attribute_code$$"/>
54+
</actionGroup>
55+
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttributeByAttributeCode">
56+
<argument name="productAttributeCode" value="$$attribute.attribute_code$$"/>
5457
</actionGroup>
5558
<actionGroup ref="AssertProductAttributeRemovedSuccessfullyActionGroup" stepKey="deleteProductAttributeSuccess"/>
5659
<!--Confirm Attribute is not present in Product Attribute Grid -->

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,11 @@
2424
<after>
2525
<actionGroup ref="logout" stepKey="logout"/>
2626
</after>
27-
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttribute">
28-
<argument name="ProductAttributeCode" value="$$createProductAttribute.attribute_code$$"/>
27+
<actionGroup ref="OpenProductAttributeFromSearchResultInGridActionGroup" stepKey="openProductAttributeFromSearchResultInGrid">
28+
<argument name="productAttributeCode" value="$$createProductAttribute.attribute_code$$"/>
29+
</actionGroup>
30+
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttributeByAttributeCode">
31+
<argument name="productAttributeCode" value="$$createProductAttribute.attribute_code$$"/>
2932
</actionGroup>
3033
<actionGroup ref="AssertProductAttributeRemovedSuccessfullyActionGroup" stepKey="deleteProductAttributeSuccess"/>
3134
<!-- Assert the product attribute is not in the grid by Attribute code -->

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,11 @@
5555
<waitForPageLoad stepKey="waitForProductToLoad"/>
5656
<seeElement selector="{{AdminProductFormSection.newAddedAttribute($$attribute.attribute_code$$)}}" stepKey="seeProductAttributeIsAdded"/>
5757
<!--Delete product attribute from product attribute grid -->
58-
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttribute">
59-
<argument name="ProductAttributeCode" value="$$attribute.attribute_code$$"/>
58+
<actionGroup ref="OpenProductAttributeFromSearchResultInGridActionGroup" stepKey="openProductAttributeFromSearchResultInGrid">
59+
<argument name="productAttributeCode" value="$$attribute.attribute_code$$"/>
60+
</actionGroup>
61+
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttributeByAttributeCode">
62+
<argument name="productAttributeCode" value="$$attribute.attribute_code$$"/>
6063
</actionGroup>
6164
<actionGroup ref="AssertProductAttributeRemovedSuccessfullyActionGroup" stepKey="deleteProductAttributeSuccess"/>
6265
<!-- Confirm attribute is not present in product attribute grid -->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181

8282
<!-- Click Delete Attribute button -->
8383
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttributeByAttributeCode">
84-
<argument name="ProductAttributeCode" value="$$productAttributeHandle.attribute_code$$"/>
84+
<argument name="productAttributeCode" value="$$productAttributeHandle.attribute_code$$"/>
8585
</actionGroup>
8686

8787
<!-- Should see error message: This attribute is used in configurable products. -->

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,14 @@
9595
<argument name="productAttributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
9696
</actionGroup>
9797
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttributeByAttributeCode">
98-
<argument name="ProductAttributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
98+
<argument name="productAttributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
9999
</actionGroup>
100100
<!-- Delete Second attribute -->
101101
<actionGroup ref="OpenProductAttributeFromSearchResultInGridActionGroup" stepKey="openSecondProductAttributeFromSearchResultInGrid">
102102
<argument name="productAttributeCode" value="$$createConfigProductAttribute2.attribute_code$$"/>
103103
</actionGroup>
104104
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteSecondProductAttributeByAttributeCode">
105-
<argument name="ProductAttributeCode" value="$$createConfigProductAttribute2.attribute_code$$"/>
105+
<argument name="productAttributeCode" value="$$createConfigProductAttribute2.attribute_code$$"/>
106106
</actionGroup>
107107
<actionGroup ref="AssertProductAttributeRemovedSuccessfullyActionGroup" stepKey="deleteProductAttributeSuccess"/>
108108
<!-- Clear filters -->

‎app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearch6SearchInvalidValueTest.xml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,11 @@
3434
<magentoCLI command="config:set {{SetMinQueryLength3Config.path}} {{SetMinQueryLength3Config.value}}" stepKey="setMinQueryLengthPreviousState"/>
3535
<!--Delete created data-->
3636
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
37-
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttribute">
38-
<argument name="ProductAttributeCode" value="{{textProductAttribute.attribute_code}}"/>
37+
<actionGroup ref="OpenProductAttributeFromSearchResultInGridActionGroup" stepKey="openProductAttributeFromSearchResultInGrid">
38+
<argument name="productAttributeCode" value="{{textProductAttribute.attribute_code}}"/>
39+
</actionGroup>
40+
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttributeByAttributeCode">
41+
<argument name="productAttributeCode" value="{{textProductAttribute.attribute_code}}"/>
3942
</actionGroup>
4043
<actionGroup ref="AssertProductAttributeRemovedSuccessfullyActionGroup" stepKey="deleteProductAttributeSuccess"/>
4144
<amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>

‎app/code/Magento/SalesRule/Test/Mftf/Test/AdminCartRulesAppliedForProductInCartTest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999

100100
<!--Go to Storefront and add product to cart and checkout from cart-->
101101
<amOnPage url="{{StorefrontProductPage.url($$simpleProduct.custom_attributes[url_key]$$)}}" stepKey="goToProductPage"/>
102+
<waitForPageLoad stepKey="waitForProductPage" />
102103
<fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="2" stepKey="setQuantity"/>
103104
<actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="AddProductToCard">
104105
<argument name="productName" value="$$simpleProduct.name$$"/>

‎app/code/Magento/Swatches/Test/Mftf/Test/AdminSaveConfigurableProductWithAttributesImagesAndSwatchesTest.xml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,11 @@
5959
</before>
6060
<after>
6161
<!-- Delete product attribute and clear grid filter -->
62-
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttribute">
63-
<argument name="ProductAttributeCode" value="{{VisualSwatchProductAttribute.attribute_code}}"/>
62+
<actionGroup ref="OpenProductAttributeFromSearchResultInGridActionGroup" stepKey="openProductAttributeFromSearchResultInGrid">
63+
<argument name="productAttributeCode" value="{{VisualSwatchProductAttribute.attribute_code}}"/>
64+
</actionGroup>
65+
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttributeByAttributeCode">
66+
<argument name="productAttributeCode" value="{{VisualSwatchProductAttribute.attribute_code}}"/>
6467
</actionGroup>
6568
<actionGroup ref="AssertProductAttributeRemovedSuccessfullyActionGroup" stepKey="deleteProductAttributeSuccess"/>
6669
<actionGroup ref="AdminGridFilterResetActionGroup" stepKey="clearAttributesGridFilter"/>

0 commit comments

Comments
 (0)