Skip to content

Commit 21107dd

Browse files
sidolovsidolov
authored
ENGCOM-9368: [MFTF] Refactoring use ActionGroup instead <see/> tag #33326 
2 parents 3b9d816 + e8e163c commit 21107dd

File tree

46 files changed

+179
-55
lines changed

Some content is hidden

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

46 files changed

+179
-55
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@
5050
</actionGroup>
5151
<!-- Verify product on Product Page -->
5252
<amOnPage url="{{StorefrontProductPage.url($createDynamicBundleProduct.custom_attributes[url_key]$)}}" stepKey="openBundleProductPage"/>
53-
<see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoopsMessage"/>
53+
<actionGroup ref="AssertStorefrontProductInfoMainProductNameActionGroup" stepKey="seeWhoopsMessage">
54+
<argument name="value" value="Whoops, our bad..."/>
55+
</actionGroup>
5456
<!-- Search for the product by sku -->
5557
<actionGroup ref="StoreFrontQuickSearchActionGroup" stepKey="searchBySku">
5658
<argument name="query" value="$createDynamicBundleProduct.sku$"/>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@
3939
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="A total of 1 record(s) have been deleted." stepKey="deleteMessage"/>
4040
<!-- Verify product on Product Page -->
4141
<amOnPage url="{{StorefrontProductPage.url($$createDynamicBundleProduct.custom_attributes[url_key]$$)}}" stepKey="amOnBundleProductPage"/>
42-
<see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
42+
<actionGroup ref="AssertStorefrontProductInfoMainProductNameActionGroup" stepKey="seeWhoops">
43+
<argument name="value" value="Whoops, our bad..."/>
44+
</actionGroup>
4345
<!-- Search for the product by sku -->
4446
<actionGroup ref="StoreFrontQuickSearchActionGroup" stepKey="searchByCreatedTerm">
4547
<argument name="query" value="$$createDynamicBundleProduct.sku$$"/>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@
3535
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="A total of 1 record(s) have been deleted." stepKey="deleteMessage"/>
3636
<!-- Verify product on Product Page -->
3737
<amOnPage url="{{StorefrontProductPage.url($$createFixedBundleProduct.custom_attributes[url_key]$$)}}" stepKey="amOnBundleProductPage"/>
38-
<see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
38+
<actionGroup ref="AssertStorefrontProductInfoMainProductNameActionGroup" stepKey="seeWhoops">
39+
<argument name="value" value="Whoops, our bad..."/>
40+
</actionGroup>
3941
<!-- Search for the product by sku -->
4042
<actionGroup ref="StoreFrontQuickSearchActionGroup" stepKey="searchByCreatedTerm">
4143
<argument name="query" value="$$createFixedBundleProduct.sku$$"/>

‎app/code/Magento/BundleImportExport/Test/Mftf/Test/AdminImportBundleProductTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,9 @@
262262
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductStorefrontPage">
263263
<argument name="productUrl" value="{{ImportProduct_Bundle.urlKey}}"/>
264264
</actionGroup>
265-
<see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{ImportProduct_Bundle.name}}" stepKey="seeProductName"/>
265+
<actionGroup ref="AssertStorefrontProductInfoMainProductNameActionGroup" stepKey="seeProductName">
266+
<argument name="value" value="{{ImportProduct_Bundle.name}}"/>
267+
</actionGroup>
266268
<see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{ImportProduct_Bundle.sku}}" stepKey="seeSku"/>
267269
<see userInput="From $20.00 To $170.00" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="seePrice"/>
268270
<seeElement selector="{{StorefrontProductInfoMainSection.productImageSrc(ImportProductSimple1_Bundle.baseImageName)}}" stepKey="seeProduct1BaseImage"/>

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="AssertStorefrontProductInfoMainProductNameActionGroup">
12+
<annotations>
13+
<description>Validates that the provided Product name are present on the Storefront Product Info Main section on the page.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="value" type="string"/>
17+
</arguments>
18+
<see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{value}}" stepKey="assertElement"/>
19+
</actionGroup>
20+
</actionGroups>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@
7777
<!--Verify product in Store Front Page-->
7878
<amOnPage url="{{StorefrontProductPage.url(SimpleProduct.urlKey)}}" stepKey="seeDefaultProductPage"/>
7979
<waitForPageLoad stepKey="waitForStoreFrontProductPageToLoad1"/>
80-
<see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="seeProductInStoreFrontPage"/>
80+
<actionGroup ref="AssertStorefrontProductInfoMainProductNameActionGroup" stepKey="seeProductInStoreFrontPage">
81+
<argument name="value" value="{{SimpleProduct.name}}"/>
82+
</actionGroup>
8183
</test>
8284
</tests>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,9 @@
121121
<waitForPageLoad stepKey="waitForPageToLoad"/>
122122
<click selector="{{StorefrontCategoryMainSection.productLink}}" stepKey="openSearchedProduct"/>
123123
<waitForPageLoad stepKey="waitForProductToLoad1"/>
124-
<see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createConfigProduct.name$$" stepKey="seeProductNameInStoreFront"/>
124+
<actionGroup ref="AssertStorefrontProductInfoMainProductNameActionGroup" stepKey="seeProductNameInStoreFront">
125+
<argument name="value" value="$$createConfigProduct.name$$"/>
126+
</actionGroup>
125127
<see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$$createConfigProduct.price$$" stepKey="seeProductPriceInStoreFront"/>
126128
<actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeProductSkuInStoreFront">
127129
<argument name="productSku" value="$$createConfigProduct.sku$$"/>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,9 @@
116116
<waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
117117
<click selector="{{StorefrontCategoryMainSection.productLink}}" stepKey="openSearchedProduct"/>
118118
<waitForPageLoad stepKey="waitForProductToLoad1"/>
119-
<see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="seeProductNameInStoreFront"/>
119+
<actionGroup ref="AssertStorefrontProductInfoMainProductNameActionGroup" stepKey="seeProductNameInStoreFront">
120+
<argument name="value" value="{{SimpleProduct.name}}"/>
121+
</actionGroup>
120122
<see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{SimpleProduct.price}}" stepKey="seeProductPriceInStoreFront"/>
121123
<actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeProductSkuInStoreFront">
122124
<argument name="productSku" value="{{SimpleProduct.sku}}"/>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@
8282
<amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="goToProductPage"/>
8383
<waitForPageLoad stepKey="waitForProductPageLoad"/>
8484
<seeInTitle userInput="{{_defaultProduct.name}}" stepKey="seeProductNameInTitlte"/>
85-
<see userInput="{{_defaultProduct.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
85+
<actionGroup ref="AssertStorefrontProductInfoMainProductNameActionGroup" stepKey="assertProductName">
86+
<argument name="value" value="{{_defaultProduct.name}}"/>
87+
</actionGroup>
8688
<see userInput="{{_defaultProduct.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
8789
<see userInput="${{_defaultProduct.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertProductPrice"/>
8890
</test>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@
7171
<!-- Verify we see created virtual product out of stock with tier price on the storefront page -->
7272
<amOnPage url="{{StorefrontProductPage.url(virtualProductOutOfStock.urlKey)}}" stepKey="goToProductPage"/>
7373
<waitForPageLoad stepKey="waitForStoreFrontProductPageToLoad"/>
74-
<see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{virtualProductOutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
74+
<actionGroup ref="AssertStorefrontProductInfoMainProductNameActionGroup" stepKey="seeVirtualProductNameOnStoreFrontPage">
75+
<argument name="value" value="{{virtualProductOutOfStock.name}}"/>
76+
</actionGroup>
7577
<actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeVirtualProductSku">
7678
<argument name="productSku" value="{{virtualProductOutOfStock.sku}}"/>
7779
</actionGroup>

0 commit comments

Comments
 (0)