Skip to content

Commit 855be72

Browse files
magento-engcom-teammagento-engcom-team
authored
[Magento Community Engineering] Community Contributions - 2.4-develop
 - merged latest code from mainline branch
2 parents 41ea3df + 3817060 commit 855be72

File tree

141 files changed

+467
-341
lines changed

Some content is hidden

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

141 files changed

+467
-341
lines changed

‎app/code/Magento/Authorization/Test/Unit/Model/ResourceModel/RulesTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public function testSaveRelNoResources()
182182
/**
183183
* Test LocalizedException throw case.
184184
*/
185-
public function testLocalizedExceptionOccurance()
185+
public function testLocalizedExceptionOccurrence()
186186
{
187187
$this->expectException(LocalizedException::class);
188188
$this->expectExceptionMessage("TestException");
@@ -212,7 +212,7 @@ public function testLocalizedExceptionOccurance()
212212
/**
213213
* Test generic exception throw case.
214214
*/
215-
public function testGenericExceptionOccurance()
215+
public function testGenericExceptionOccurrence()
216216
{
217217
$exception = new \Exception('GenericException');
218218

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<magentoCron stepKey="runCronIndex" groups="index"/>
2626
</before>
2727
<after>
28-
<amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
28+
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
2929
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
3030
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
3131
</after>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2323
</before>
2424
<after>
25-
<amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
25+
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
2626
</after>
2727
<!-- Create a new attribute set -->
2828
<amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSets"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2222
</before>
2323
<after>
24-
<amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
24+
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
2525
</after>
2626
<!--Create attribute set-->
2727
<actionGroup ref="CreateDefaultAttributeSetActionGroup" stepKey="createDefaultAttributeSet">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<magentoCron stepKey="runCronIndex" groups="index"/>
2626
</before>
2727
<after>
28-
<amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
28+
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
2929
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
3030
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
3131
</after>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<argument name="product" value="BundleProduct"/>
3232
</actionGroup>
3333
<!--Logging out-->
34-
<amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
34+
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
3535
<deleteData createDataKey="simpleProduct0" stepKey="deleteSimpleProduct0"/>
3636
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
3737
</after>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<magentoCron stepKey="runCronIndex" groups="index"/>
2626
</before>
2727
<after>
28-
<amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
28+
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
2929
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
3030
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
3131
</after>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<after>
3030
<!--Clear Filters-->
3131
<actionGroup ref="AdminClearFiltersActionGroup" stepKey="ClearFiltersAfter"/>
32-
<amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
32+
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
3333
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
3434
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
3535
<deleteData createDataKey="simpleProduct3" stepKey="deleteSimpleProduct3"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteBundleProduct">
3030
<argument name="sku" value="{{BundleProduct.sku}}"/>
3131
</actionGroup>
32-
<amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
32+
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
3333
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
3434
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
3535
</after>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
3535
<argument name="customerEmail" value="CustomerEntityOne.email"/>
3636
</actionGroup>
37-
<amOnPage url="{{AdminLogoutPage.url}}" stepKey="logout"/>
37+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3838
</after>
3939
<amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage"/>
4040
<waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<click selector="{{CurrencySetupSection.currencyOptions}}" stepKey="closeOptions"/>
4141
<waitForPageLoad stepKey="waitForCloseOptions"/>
4242
<click stepKey="saveUnselectedConfigs" selector="{{AdminConfigSection.saveButton}}"/>
43-
<amOnPage url="{{AdminLogoutPage.url}}" stepKey="logout"/>
43+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4444
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
4545
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
4646
</after>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<after>
3030
<!--Clear Filters-->
3131
<actionGroup ref="AdminClearFiltersActionGroup" stepKey="ClearFiltersAfter"/>
32-
<amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
32+
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
3333
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
3434
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
3535
<deleteData createDataKey="simpleProduct3" stepKey="deleteSimpleProduct3"/>
@@ -130,8 +130,7 @@
130130
<dontSeeElement stepKey="LookingForNameOfProductDisabled" selector="{{StorefrontBundledSection.bundleProductName}}"/>
131131

132132
<!--Enabling bundle products-->
133-
<amOnPage url="{{ProductCatalogPage.url}}" stepKey="GoToCatalogPageChangingView"/>
134-
<waitForPageLoad stepKey="WaitForPageToLoadFullyChangingView"/>
133+
<actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="goToCatalogPageChangingView"/>
135134
<click selector="{{AdminProductFiltersSection.allCheckbox}}" stepKey="ClickOnSelectAllCheckBoxChangingView"/>
136135
<click selector="{{AdminProductFiltersSection.actions}}" stepKey="ClickOnActionsChangingView"/>
137136
<click selector="{{AdminProductFiltersSection.changeStatus}}" stepKey="ClickOnChangeStatusChangingView"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2323
</before>
2424
<after>
25-
<amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
25+
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
2626
</after>
2727
<amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage"/>
2828
<waitForPageLoad stepKey="WaitForPageToLoad"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<magentoCron stepKey="runCronIndex" groups="index"/>
2626
</before>
2727
<after>
28-
<amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
28+
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
2929
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
3030
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
3131
</after>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
2525
</before>
2626
<after>
27-
<amOnPage url="{{AdminLogoutPage.url}}" stepKey="logout"/>
27+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
2828
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
2929
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
3030
</after>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<magentoCron stepKey="runCronIndex" groups="index"/>
2626
</before>
2727
<after>
28-
<amOnPage url="{{AdminLogoutPage.url}}" stepKey="logout"/>
28+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
2929
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
3030
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
3131
</after>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</before>
3030
<after>
3131
<!--Logging out-->
32-
<amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
32+
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
3333
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
3434
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
3535
<deleteData createDataKey="simpleProduct3" stepKey="deleteSimpleProduct3"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<actionGroup stepKey="deleteBundle" ref="DeleteProductUsingProductGridActionGroup">
3131
<argument name="product" value="BundleProduct"/>
3232
</actionGroup>
33-
<amOnPage url="{{AdminLogoutPage.url}}" stepKey="logout"/>
33+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3434
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
3535
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
3636
</after>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<magentoCron stepKey="runCronIndex" groups="index"/>
2626
</before>
2727
<after>
28-
<amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
28+
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
2929
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
3030
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
3131
</after>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<magentoCron stepKey="runCronIndex" groups="index"/>
2727
</before>
2828
<after>
29-
<amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
29+
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
3030
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
3131
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
3232
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>

‎app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/BundleTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,13 +150,13 @@ public function testAfterInitializeIfBundleAnsCustomOptionsAndBundleSelectionsEx
150150
$this->productMock->expects($this->once())
151151
->method('getBundleOptionsData')
152152
->willReturn(['option_1' => ['delete' => 1]]);
153-
$extentionAttribute = $this->getMockBuilder(ProductExtensionInterface::class)
153+
$extensionAttribute = $this->getMockBuilder(ProductExtensionInterface::class)
154154
->disableOriginalConstructor()
155155
->setMethods(['setBundleProductOptions'])
156156
->getMockForAbstractClass();
157-
$extentionAttribute->expects($this->once())->method('setBundleProductOptions')->with([]);
158-
$this->productMock->expects($this->once())->method('getExtensionAttributes')->willReturn($extentionAttribute);
159-
$this->productMock->expects($this->once())->method('setExtensionAttributes')->with($extentionAttribute);
157+
$extensionAttribute->expects($this->once())->method('setBundleProductOptions')->with([]);
158+
$this->productMock->expects($this->once())->method('getExtensionAttributes')->willReturn($extensionAttribute);
159+
$this->productMock->expects($this->once())->method('setExtensionAttributes')->with($extensionAttribute);
160160

161161
$this->model->afterInitialize($this->subjectMock, $this->productMock);
162162
}
@@ -191,14 +191,14 @@ public function testAfterInitializeIfBundleOptionsNotExist(): void
191191
['affect_bundle_product_selections', null, false],
192192
];
193193
$this->requestMock->expects($this->any())->method('getPost')->willReturnMap($valueMap);
194-
$extentionAttribute = $this->getMockBuilder(ProductExtensionInterface::class)
194+
$extensionAttribute = $this->getMockBuilder(ProductExtensionInterface::class)
195195
->disableOriginalConstructor()
196196
->setMethods(['setBundleProductOptions'])
197197
->getMockForAbstractClass();
198-
$extentionAttribute->expects($this->once())->method('setBundleProductOptions')->with([]);
198+
$extensionAttribute->expects($this->once())->method('setBundleProductOptions')->with([]);
199199
$this->productMock->expects($this->any())->method('getCompositeReadonly')->willReturn(false);
200-
$this->productMock->expects($this->once())->method('getExtensionAttributes')->willReturn($extentionAttribute);
201-
$this->productMock->expects($this->once())->method('setExtensionAttributes')->with($extentionAttribute);
200+
$this->productMock->expects($this->once())->method('getExtensionAttributes')->willReturn($extensionAttribute);
201+
$this->productMock->expects($this->once())->method('setExtensionAttributes')->with($extensionAttribute);
202202
$this->productMock->expects($this->once())->method('setCanSaveBundleSelections')->with(false);
203203

204204
$this->model->afterInitialize($this->subjectMock, $this->productMock);

‎app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest/CaptchaWithDisabledGuestCheckoutTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@
3434
</after>
3535
<amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.sku$$)}}" stepKey="openProductPage"/>
3636
<waitForPageLoad stepKey="waitForPageLoad"/>
37-
<click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCart"/>
38-
<waitForPageLoad stepKey="waitForAddToCart"/>
39-
<waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
37+
<actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage"/>
4038
<waitForText userInput="You added $$createSimpleProduct.name$$ to your shopping cart." stepKey="waitForText"/>
4139
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickCart"/>
4240
<click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout"/>

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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="AdminProductCatalogPageOpenActionGroup">
12+
<annotations>
13+
<description>Goes to the Admin Product Catalog Page grid page.</description>
14+
</annotations>
15+
16+
<amOnPage url="{{ProductCatalogPage.url}}" stepKey="openProductCatalogPage"/>
17+
<waitForPageLoad stepKey="waitForProductCatalogPageLoad"/>
18+
</actionGroup>
19+
</actionGroups>

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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="StorefrontAssertProperUrlIsShownActionGroup">
12+
<annotations>
13+
<description>Validate that the URL path is correct</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="urlPath" type="string"/>
17+
</arguments>
18+
19+
<seeInCurrentUrl url="{{urlPath}}" stepKey="checkUrl"/>
20+
</actionGroup>
21+
</actionGroups>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2323
</before>
2424
<after>
25-
<amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
25+
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
2626
</after>
2727

2828
<!--Create product-->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2323
</before>
2424
<after>
25-
<amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
25+
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
2626
</after>
2727

2828
<!--Create product-->

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,7 @@
7878
<see selector="{{StorefrontProductInfoMainSection.productStockStatus}}" userInput="In Stock" stepKey="seeProductStatusInStoreFront"/>
7979
<!--Add Product to the cart-->
8080
<fillField selector="{{StorefrontProductPageSection.qtyInput}}" userInput="1" stepKey="fillProductQuantity"/>
81-
<click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="clickOnAddToCartButton"/>
82-
<waitForPageLoad stepKey="waitForProductToAddInCart"/>
83-
<waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
81+
<actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage"/>
8482
<seeElement selector="{{StorefrontProductPageSection.successMsg}}" stepKey="seeSuccessSaveMessage"/>
8583
<seeElement selector="{{StorefrontMinicartSection.quantity(1)}}" stepKey="seeAddedProductQuantityInCart"/>
8684
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickOnMiniCart"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<after>
2828
<!-- Delete the created category -->
2929
<actionGroup ref="DeleteMostRecentCategoryActionGroup" stepKey="getRidOfCreatedCategory"/>
30-
<amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
30+
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
3131
<deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
3232
</after>
3333

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<seeElement selector="{{AdminProductFormSection.attributeLabelByText(ProductAttributeFrontendLabel.label)}}" stepKey="seeAttributeLabelInProductForm"/>
106106

107107
<!--Verify Product Attribute in Attribute Form -->
108-
<amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
108+
<actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="navigateToProductAttributeGrid"/>
109109
<fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="{{newProductAttribute.attribute_code}}" stepKey="setAttributeCode"/>
110110
<click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
111111
<waitForPageLoad stepKey="waitForPageLoad" />

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
<!-- Generate the datetime default value -->
3030
<generateDate date="now" format="n/j/y g:i A" stepKey="generateDefaultValue"/>
3131
<!-- Create new datetime product attribute -->
32-
<amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
33-
<waitForPageLoad stepKey="waitForPageLoadAttributes"/>
32+
<actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="goToProductAttributes"/>
3433
<actionGroup ref="CreateProductAttributeWithDatetimeFieldActionGroup" stepKey="createAttribute">
3534
<argument name="attribute" value="DatetimeProductAttribute"/>
3635
<argument name="date" value="{$generateDefaultValue}"/>

0 commit comments

Comments
 (0)