Skip to content

Commit 6fafe03

Browse files
alzotaalzota
committed
Merge branch '2.4.9-alpha3-develop' of github.com:magento-commerce/magento2ce into ACP2E-4018-alpha3
# Conflicts: # app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductSwatchUpdateCartItemTierPriceTest.xml # app/code/Magento/Customer/etc/frontend/di.xml # app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml # app/code/Magento/Customer/view/frontend/templates/form/login.phtml # app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedProductsAreListedWhenOutOfStockTest.xml # app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php # app/code/Magento/MediaGalleryRenditions/Model/GenerateRenditions.php # app/code/Magento/MediaGalleryRenditions/Test/Integration/Model/GenerateRenditionsTest.php # app/code/Magento/Quote/Test/Unit/Model/Quote/Item/RepositoryTest.php # app/code/Magento/Quote/etc/webapi_soap/di.xml # app/code/Magento/Shipping/Test/Mftf/ActionGroup/StorefrontSelectShippingMethodBasedOnAddressActionGroup.xml # app/code/Magento/Shipping/Test/Mftf/ActionGroup/StorefrontVerifyOrderInformationBeforePlacingOrderActionGroup.xml # app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php # app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml
2 parents e135bcf + 7b38a7d commit 6fafe03

File tree

176 files changed

+7282
-425
lines changed

Some content is hidden

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

176 files changed

+7282
-425
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,11 @@
6565
<comment userInput="Delete created data" stepKey="commentDeleteCreatedData"/>
6666
<deleteData createDataKey="createCustomerViaTheStorefront" stepKey="deleteCustomerViaTheStorefront"/>
6767
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
68+
<deleteData createDataKey="createSimpleProduct1" stepKey="deleteSimpleProduct1"/>
69+
<deleteData createDataKey="createSimpleProduct2" stepKey="deleteSimpleProduct2"/>
6870
<!-- Log out -->
6971
<comment userInput="Log out" stepKey="commentLogOut"/>
72+
<deleteData createDataKey="createCategory" stepKey="deletecreateCategory"/>
7073
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
7174
</after>
7275
<!-- Login to the Storefront as created customer -->

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
</actionGroup>
3131
</before>
3232
<after>
33+
<!-- Delete all products via API using ProductApiHelper -->
34+
<helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
3335
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
34-
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
35-
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
3636
</after>
3737

3838
<!-- Create a bundle product -->

‎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/AdminAttributeSetSelectionTest.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2424
</before>
2525
<after>
26+
<!-- Delete all products via API using ProductApiHelper -->
27+
<helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
2628
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
2729
</after>
2830
<!-- Create a new attribute set -->
@@ -52,7 +54,7 @@
5254
</actionGroup>
5355
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="searchForAttrSet"/>
5456
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="selectAttrSet"/>
55-
57+
5658
<fillField selector="{{AdminProductFormBundleSection.productName}}" userInput="{{BundleProduct.name}}" stepKey="fillProductName"/>
5759
<fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku}}" stepKey="fillProductSku"/>
5860

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
3434
</before>
3535
<after>
36-
<!-- Delete the simple product -->
37-
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
36+
<!-- Delete all products created via API -->
37+
<helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
3838

3939
<!-- Delete a Website -->
4040
<actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
@@ -142,12 +142,6 @@
142142
<!-- Assert Gift Option product settings -->
143143
<actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openCart"/>
144144
<dontSeeElement selector="{{StorefrontProductCartGiftOptionSection.giftOptions}}" stepKey="dontSeeGiftOptionBtn"/>
145-
146-
<!-- Delete created bundle product -->
147-
<actionGroup ref="DeleteProductUsingProductGridActionGroup" stepKey="deleteProduct">
148-
<argument name="product" value="BundleProduct"/>
149-
</actionGroup>
150-
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilters"/>
151145
</test>
152146
</tests>
153147

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
</actionGroup>
2828
</before>
2929
<after>
30+
<!-- Delete bundle product created via UI -->
31+
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteBundleProduct">
32+
<argument name="sku" value="{{BundleProduct.sku}}"/>
33+
</actionGroup>
3034
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
3135
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
3236
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
<deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
3636
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
3737
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
38+
<!-- Delete bundle product created via API -->
39+
<helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
3840
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3941
</after>
4042
<!--Go to bundle product creation page-->

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,9 @@
3131
<after>
3232
<!--Clear Filters-->
3333
<actionGroup ref="AdminClearFiltersActionGroup" stepKey="ClearFiltersAfter"/>
34+
<!-- Delete all created products via API -->
35+
<helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
3436
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
35-
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
36-
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
37-
<deleteData createDataKey="simpleProduct3" stepKey="deleteSimpleProduct3"/>
38-
<deleteData createDataKey="simpleProduct4" stepKey="deleteSimpleProduct4"/>
3937
</after>
4038

4139
<!--Go to bundle product creation page-->

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
</before>
3030

3131
<after>
32-
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
33-
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
32+
<!-- Delete all products via API -->
33+
<helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
3434
</after>
3535

3636
<!-- A Cms page containing the New Products Widget gets created here via extends -->

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
<createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
2525
</before>
2626
<after>
27+
<!-- Delete all the products via API -->
28+
<helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
2729
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
28-
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
29-
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
3030
</after>
3131

3232
<!-- Start creating a bundle product -->

0 commit comments

Comments
 (0)