Skip to content

Commit 6fe5994

Browse files
jilu1jilu1
committed
MQE-2046: remove deprecated entities usages in MFTF tests
1 parent 9c1955a commit 6fe5994

File tree

26 files changed

+50
-842
lines changed

26 files changed

+50
-842
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@
120120
</actionGroup>
121121

122122
<!-- Assert first bundle products in category product grid -->
123-
<actionGroup ref="AssertProductOnCategoryPageActionGroup" stepKey="assertFirstBundleProduct">
124-
<argument name="product" value="$$createFirstBundleProduct$$"/>
123+
<actionGroup ref="AssertStorefrontProductIsPresentOnCategoryPageActionGroup" stepKey="assertFirstBundleProduct">
124+
<argument name="productName" value="$$createFirstBundleProduct.name$$"/>
125125
</actionGroup>
126126
<actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seePriceRangeFromForFirstBundleProduct">
127127
<argument name="selector" value="{{StorefrontCategoryProductSection.priceFromByProductId($$createFirstBundleProduct.id$$)}}"/>
@@ -133,8 +133,8 @@
133133
</actionGroup>
134134

135135
<!-- Assert second bundle products in category product grid -->
136-
<actionGroup ref="AssertProductOnCategoryPageActionGroup" stepKey="assertSecondBundleProduct">
137-
<argument name="product" value="$$createSecondBundleProduct$$"/>
136+
<actionGroup ref="AssertStorefrontProductIsPresentOnCategoryPageActionGroup" stepKey="assertSecondBundleProduct">
137+
<argument name="productName" value="$$createSecondBundleProduct.name$$"/>
138138
</actionGroup>
139139
<actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seePriceRangeFromForSecondBundleProduct">
140140
<argument name="selector" value="{{StorefrontCategoryProductSection.priceFromByProductId($$createSecondBundleProduct.id$$)}}"/>
@@ -146,8 +146,8 @@
146146
</actionGroup>
147147

148148
<!-- Assert third bundle products in category product grid -->
149-
<actionGroup ref="AssertProductOnCategoryPageActionGroup" stepKey="assertThirdBundleProduct">
150-
<argument name="product" value="$$createThirdBundleProduct$$"/>
149+
<actionGroup ref="AssertStorefrontProductIsPresentOnCategoryPageActionGroup" stepKey="assertThirdBundleProduct">
150+
<argument name="productName" value="$$createThirdBundleProduct.name$$"/>
151151
</actionGroup>
152152
<actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seePriceRangeFromForThirdBundleProduct">
153153
<argument name="selector" value="{{StorefrontCategoryProductSection.priceFromByProductId($$createThirdBundleProduct.id$$)}}"/>

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

Lines changed: 0 additions & 20 deletions
This file was deleted.

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

Lines changed: 0 additions & 29 deletions
This file was deleted.

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

Lines changed: 0 additions & 25 deletions
This file was deleted.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@
9696
<actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="openCategoryPageOnFrontend">
9797
<argument name="category" value="$categoryEntity$"/>
9898
</actionGroup>
99-
<actionGroup ref="AssertProductOnCategoryPageActionGroup" stepKey="checkProductOnCategoryPage">
100-
<argument name="product" value="virtualProductGeneralGroup"/>
99+
<actionGroup ref="AssertStorefrontProductIsPresentOnCategoryPageActionGroup" stepKey="checkProductOnCategoryPage">
100+
<argument name="productName" value="{{virtualProductGeneralGroup.name}}"/>
101101
</actionGroup>
102102

103103
<!--Verify customer see updated virtual product with tier price on product storefront page -->

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@
108108
<actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="openCategoryPageOnFrontend">
109109
<argument name="category" value="$categoryEntity$"/>
110110
</actionGroup>
111-
<actionGroup ref="AssertProductOnCategoryPageActionGroup" stepKey="checkProductOnCategoryPage">
112-
<argument name="product" value="updateVirtualProductTierPriceInStock"/>
111+
<actionGroup ref="AssertStorefrontProductIsPresentOnCategoryPageActionGroup" stepKey="checkProductOnCategoryPage">
112+
<argument name="productName" value="{{updateVirtualProductTierPriceInStock.name}}"/>
113113
</actionGroup>
114114

115115
<!--Verify customer see updated virtual product with tier price on product storefront page -->

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
</createData>
3636
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
3737
<!-- Login as admin -->
38-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
38+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
3939
<!-- Create product widget -->
4040
<actionGroup ref="AdminCreateRecentlyProductsWidgetActionGroup" stepKey="createRecentlyComparedProductsWidget">
4141
<argument name="widget" value="RecentlyComparedProductsWidget"/>
@@ -51,7 +51,7 @@
5151
<argument name="widget" value="RecentlyComparedProductsWidget"/>
5252
</actionGroup>
5353
<!-- Logout Admin -->
54-
<actionGroup ref="logout" stepKey="logout"/>
54+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
5555
<!-- Reset Stores > Configurations > Catalog > Recently Viewed/Compared Products > Show for Current = Website-->
5656
<magentoCLI command="config:set {{RecentlyViewedProductScopeWebsite.path}} {{RecentlyViewedProductScopeWebsite.value}}" stepKey="RecentlyViewedProductScopeWebsite"/>
5757
<!-- Delete Products and Category -->
@@ -66,7 +66,7 @@
6666
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginCustomer">
6767
<argument name="Customer" value="$$createCustomer$$"/>
6868
</actionGroup>
69-
<see userInput="Welcome, $$createCustomer.firstname$$ $$createCustomer.lastname$$!" selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="checkWelcomeMessage"/>
69+
<see userInput="Welcome, $$createCustomer.firstname$$ $$createCustomer.lastname$$!" selector="{{StorefrontPanelHeaderSection.welcomeMessage}}" stepKey="checkWelcomeMessage"/>
7070
<amOnPage url="{{StorefrontCategoryPage.url($$createCategory.custom_attributes[url_key]$$)}}" stepKey="openCategoryPageAfterAddedProductToCart"/>
7171
<!--Add to compare Simple Product and Simple Product 2-->
7272
<actionGroup ref="StorefrontAddCategoryProductToCompareActionGroup" stepKey="addSimpleProduct1ToCompare" >

‎app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<!-- action group to create a new catalog price rule giving a catalogRule entity -->
1212
<actionGroup name="NewCatalogPriceRuleByUIActionGroup">
1313
<annotations>
14-
<description>DEPRECATED. Please use set of AG: AdminOpenNewCatalogPriceRuleFormPageActionGroup, AdminCatalogPriceRuleFillMainInfoActionGroup, AdminCatalogPriceRuleFillActionsActionGroup, AdminCatalogPriceRuleSaveAndApplyActionGroup
14+
<description>Consider using set of AG: AdminOpenNewCatalogPriceRuleFormPageActionGroup, AdminCatalogPriceRuleFillMainInfoActionGroup, AdminCatalogPriceRuleFillActionsActionGroup, AdminCatalogPriceRuleSaveAndApplyActionGroup
1515
Goes to the Catalog Price Rule grid. Clicks on Add. Fills in the provided Catalog Rule details.</description>
1616
</annotations>
1717
<arguments>

‎app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/NewCatalogPriceRuleByUIWithConditionIsSKUActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="NewCatalogPriceRuleByUIWithConditionIsSKUActionGroup" extends="NewCatalogPriceRuleByUIActionGroup">
1212
<annotations>
13-
<description>DEPRECATED. Please use set of AG: AdminOpenNewCatalogPriceRuleFormPageActionGroup, AdminCatalogPriceRuleFillMainInfoActionGroup, AdminCatalogPriceRuleFillActionsActionGroup, AdminCatalogPriceRuleAddSkuConditionActionGroup, AdminCatalogPriceRuleSaveAndApplyActionGroup
13+
<description>Consider using set of AG: AdminOpenNewCatalogPriceRuleFormPageActionGroup, AdminCatalogPriceRuleFillMainInfoActionGroup, AdminCatalogPriceRuleFillActionsActionGroup, AdminCatalogPriceRuleAddSkuConditionActionGroup, AdminCatalogPriceRuleSaveAndApplyActionGroup
1414
EXTENDS: newCatalogPriceRuleByUI. Add a Catalog Price Rule Condition based on the provided SKU.</description>
1515
</annotations>
1616
<arguments>

0 commit comments

Comments
 (0)