Skip to content

Commit 63837c9

Browse files
Merge branch 'ACQE-8274' into ACQE-functional-deployment-v3-6
2 parents 835e075 + 1afc9a4 commit 63837c9

File tree

23 files changed

+83
-47
lines changed

23 files changed

+83
-47
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
6868
<!-- Log out -->
6969
<comment userInput="Log out" stepKey="commentLogOut"/>
70+
<deleteData createDataKey="createCategory" stepKey="deletecreateCategory"/>
7071
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
7172
</after>
7273
<!-- Login to the Storefront as created customer -->

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
<actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridFilter"/>
8888

8989
<!-- Admin logout -->
90+
<deleteData createDataKey="createCategory" stepKey="deletecreateCategory"/>
9091
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
9192
</after>
9293

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGridTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
</before>
3333
<after>
3434
<!--Logging out-->
35+
<actionGroup ref="AdminDeleteCategoryByNameActionGroup" stepKey="deleteCategory">
36+
<argument name="categoryName" value="{{SimpleSubCategory.name}}"/>
37+
</actionGroup>
3538
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
3639
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
3740
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckPriceForDynamicBundleProductWithMixedDiscountsTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,9 @@
173173
<deleteData createDataKey="sixthProduct" stepKey="deleteSixthProduct"/>
174174
<deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
175175
<actionGroup ref="AdminCatalogPriceRuleDeleteAllActionGroup" stepKey="deleteCatalogPriceRules"/>
176+
<deleteData createDataKey="category1" stepKey="deletecategory1"/>
177+
<deleteData createDataKey="category2" stepKey="deletecategory2"/>
178+
<deleteData createDataKey="category3" stepKey="deletecategory3"/>
176179
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
177180
</after>
178181
<!-- Go to storefront category page -->

app/code/Magento/BundleImportExport/Test/Mftf/Test/UpdateBundleProductViaImportTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
<argument name="sku" value="Simple"/>
3131
</actionGroup>
3232
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilters"/>
33+
<actionGroup ref="AdminDeleteCategoryByNameActionGroup" stepKey="deleteCategory">
34+
<argument name="categoryName" value="New"/>
35+
</actionGroup>
3336
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
3437
</after>
3538

app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeContentOfWysiwygEditorForDisabledByDefaultTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@
4444
<deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock" />
4545
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
4646
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
47+
<actionGroup ref="AdminDeleteCategoryByNameActionGroup" stepKey="deleteCategory">
48+
<argument name="categoryName" value="{{SimpleSubCategory.name}}"/>
49+
</actionGroup>
4750
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4851
</after>
4952
<!--Step-1: Login to admin-->

app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest/AdminCreateCategoryTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
<group value="cloud"/>
2020
</annotations>
2121
<after>
22+
<actionGroup ref="AdminDeleteCategoryByNameActionGroup" stepKey="deleteCategory">
23+
<argument name="categoryName" value="{{SimpleSubCategory.name}}"/>
24+
</actionGroup>
2225
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
2326
</after>
2427

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductsCompareWithEmptyAttributeTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<deleteData createDataKey="createProductAttribute" stepKey="deleteProductAttribute"/>
3434
<deleteData createDataKey="createSimpleProduct1" stepKey="deleteSimpleProduct1"/>
3535
<deleteData createDataKey="createSimpleProduct2" stepKey="deleteSimpleProduct2"/>
36+
<deleteData createDataKey="createCategory" stepKey="deletecreateCategory"/>
3637
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
3738

3839
<!-- Reindex invalidated indices after product attribute has been created/deleted -->

app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEIsNativeWYSIWYGOnCatalogTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@
4545
<see userInput="Hello World!" selector="{{StorefrontCategoryMainSection.CatalogDescription}}" stepKey="assertCatalogDescription"/>
4646
<after>
4747
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
48+
<actionGroup ref="AdminDeleteCategoryByNameActionGroup" stepKey="deleteCategory">
49+
<argument name="categoryName" value="{{SimpleSubCategory.name}}"/>
50+
</actionGroup>
4851
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4952
</after>
5053
</test>

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSearchTest/AdminConfigurableProductFilterByTypeTest.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
3+
/**
4+
* Copyright 2020 Adobe
5+
* All Rights Reserved.
6+
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -67,6 +67,7 @@
6767
</before>
6868

6969
<after>
70+
<deleteData createDataKey="createCategory" stepKey="deletecreateCategory"/>
7071
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
7172
<deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
7273
<deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>

0 commit comments

Comments
 (0)