Skip to content

Commit f7875fc

Browse files
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop
Accepted Community Pull Requests: - #27547: Fix type hint for Select::where (by @marcusirgens) - #27671: [MFTF] Use Action Group to click on minicart (by @Usik2203) - #27552: Fix issue with loading mask on Admin Checkout (by @lbajsarowicz)
2 parents a73532a + 01d2e0e commit f7875fc

File tree

26 files changed

+36
-43
lines changed

26 files changed

+36
-43
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@
7777
<argument name="product" value="$$simpleProduct2$$"/>
7878
<argument name="currency" value="USD - US Dollar"/>
7979
</actionGroup>
80-
<click stepKey="openMiniCart" selector="{{StorefrontMinicartSection.showCart}}"/>
81-
<waitForPageLoad stepKey="waitForMiniCart"/>
80+
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="openMiniCart"/>
8281
<see stepKey="seeCartSubtotal" userInput="$12,300.00"/>
8382
</test>
8483
</tests>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<waitForPageLoad stepKey="waitForAddToCart"/>
3939
<waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
4040
<waitForText userInput="You added $$createSimpleProduct.name$$ to your shopping cart." stepKey="waitForText"/>
41-
<click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickCart"/>
41+
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickCart"/>
4242
<click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout"/>
4343
<waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.email}}" stepKey="waitEmailFieldVisible"/>
4444
<fillField selector="{{StorefrontCustomerSignInPopupFormSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="fillCustomerEmail"/>
@@ -50,7 +50,7 @@
5050
<waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton"/>
5151
<reloadPage stepKey="refreshPage"/>
5252
<waitForPageLoad stepKey="waitForPageLoad2"/>
53-
<click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickCart2"/>
53+
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickCart2"/>
5454
<click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout2"/>
5555
<waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.email}}" stepKey="waitEmailFieldVisible2"/>
5656
<waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaField}}" stepKey="seeCaptchaField2"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
8484
<seeElement selector="{{StorefrontProductPageSection.successMsg}}" stepKey="seeSuccessSaveMessage"/>
8585
<seeElement selector="{{StorefrontMinicartSection.quantity(1)}}" stepKey="seeAddedProductQuantityInCart"/>
86-
<click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickOnMiniCart"/>
86+
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickOnMiniCart"/>
8787
<see selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="{{SimpleProduct.name}}" stepKey="seeProductNameInMiniCart"/>
8888
<see selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="{{SimpleProduct.price}}" stepKey="seeProductPriceInMiniCart"/>
8989
<seeElement selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="seeCheckOutButtonInMiniCart"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<seeElement selector="{{StorefrontProductMediaSection.imageFile(placeholderBaseImage.name)}}" stepKey="seeBasePlaceholderImage"/>
115115
<click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addProductToCart1"/>
116116
<waitForElementVisible selector="{{StorefrontProductPageSection.successMsg}}" stepKey="waitForProductAdded1"/>
117-
<click selector="{{StorefrontMinicartSection.showCart}}" stepKey="openMiniCart1"/>
117+
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="openMiniCart1"/>
118118
<grabAttributeFrom selector="{{StorefrontMinicartSection.productImageByName($$productNoImages.name$$)}}" userInput="src" stepKey="getThumbnailPlaceholderImageSrc"/>
119119
<assertContains stepKey="checkThumbnailPlaceholderImage">
120120
<actualResult type="variable">$getThumbnailPlaceholderImageSrc</actualResult>
@@ -132,7 +132,7 @@
132132
<dontSeeElement selector="{{StorefrontProductMediaSection.imageFile(placeholderBaseImage.name)}}" stepKey="dontSeeBasePlaceholderImage"/>
133133
<click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addProductToCart2"/>
134134
<waitForElementVisible selector="{{StorefrontProductPageSection.successMsg}}" stepKey="waitForProductAdded2"/>
135-
<click selector="{{StorefrontMinicartSection.showCart}}" stepKey="openMiniCart2"/>
135+
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="openMiniCart2"/>
136136
<grabAttributeFrom selector="{{StorefrontMinicartSection.productImageByName($$productWithImages.name$$)}}" userInput="src" stepKey="getThumbnailImageSrc"/>
137137
<assertNotContains stepKey="checkThumbnailImage">
138138
<actualResult type="variable">$getThumbnailImageSrc</actualResult>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
<waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
156156
<seeElement selector="{{StorefrontProductPageSection.successMsg}}" stepKey="seeYouAddedSimpleprod4ToYourShoppingCartSuccessSaveMessage"/>
157157
<seeElement selector="{{StorefrontMinicartSection.quantity(1)}}" stepKey="seeAddedProductQuantityInCart"/>
158-
<click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickOnMiniCart"/>
158+
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickOnMiniCart"/>
159159
<see selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="{{simpleProductRegularPriceCustomOptions.name}}" stepKey="seeProductNameInMiniCart"/>
160160
<see selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="{{simpleProductRegularPriceCustomOptions.storefront_new_cartprice}}" stepKey="seeProductPriceInMiniCart"/>
161161
</test>

app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromConfigurableProductTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,7 @@
135135
<waitForPageLoad time="30" stepKey="waitForPageLoad4"/>
136136
<waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
137137
<see selector="{{StorefrontMessagesSection.success}}" userInput="You added $$createConfigProduct1.name$ to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
138-
<click selector="{{StorefrontMinicartSection.showCart}}" stepKey="openMiniShoppingCart1"/>
139-
<waitForPageLoad time="30" stepKey="waitForPageLoad5"/>
138+
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="openMiniShoppingCart1"/>
140139
<see selector="{{StorefrontMinicartSection.productPriceByName($$createConfigProduct1.name$$)}}" userInput="$$createConfigProduct1.price$$" stepKey="seeCorrectProductPrice1"/>
141140
</test>
142141
</tests>

app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromSimpleProductTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addProductToShoppingCart1">
8181
<argument name="productName" value="$$createProduct1.name$$"/>
8282
</actionGroup>
83-
<click selector="{{StorefrontMinicartSection.showCart}}" stepKey="openMiniShoppingCart1"/>
83+
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="openMiniShoppingCart1"/>
8484
<see selector="{{StorefrontMinicartSection.productPriceByName($$createProduct1.name$$)}}" userInput="$$createProduct1.price$$" stepKey="seeCorrectProductPrice1"/>
8585

8686
<!-- Assert that the rule isn't present on the Checkout page -->

app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,16 @@
4141
<see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$createSimpleProduct.name$$ to your shopping cart." stepKey="seeAddedToCartMessage"/>
4242
<see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
4343
<!-- open the minicart -->
44-
<click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickShowMinicart1"/>
44+
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickShowMinicart1"/>
4545
<click selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="editProductFromMiniCart"/>
46-
<click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickShowMinicart2"/>
46+
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickShowMinicart2"/>
4747
<click selector="{{StorefrontMinicartSection.deleteMiniCartItem}}" stepKey="deleteMiniCartItem"/>
4848
<waitForElementVisible selector="{{StoreFrontRemoveItemModalSection.message}}" stepKey="waitFortheConfirmationModal"/>
4949
<see selector="{{StoreFrontRemoveItemModalSection.message}}" userInput="Are you sure you would like to remove this item from the shopping cart?" stepKey="seeDeleteConfirmationMessage"/>
5050
<click selector="{{StoreFrontRemoveItemModalSection.ok}}" stepKey="confirmDelete"/>
5151
<waitForPageLoad stepKey="waitForDeleteToFinish"/>
5252
<dontSeeElement selector="{{CheckoutCartProductSection.RemoveItem}}" stepKey="dontSeeDeleteProductFromCheckoutCart"/>
53-
<click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickCart"/>
54-
<waitForPageLoad stepKey="WaitForPageLoad3"/>
53+
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickCart"/>
5554
<see userInput="You have no items in your shopping cart." stepKey="seeNoItemsInShoppingCart"/>
5655
</test>
5756
</tests>

app/code/Magento/Checkout/Test/Mftf/Test/ShoppingCartAndMiniShoppingCartPerCustomerTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,7 @@
168168

169169
<!-- Assert product in mini cart -->
170170
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomePage"/>
171-
<click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickOnMiniCart"/>
172-
<waitForPageLoad stepKey="waitForPageToLoad"/>
171+
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickOnMiniCart"/>
173172
<actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertProductInMiniCart">
174173
<argument name="productName" value="$$createSimpleProduct.name$$"/>
175174
<argument name="productPrice" value="$$createSimpleProduct.price$$"/>

app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</assertEquals>
4646

4747
<!--Open minicart and change Qty-->
48-
<click selector="{{StorefrontMinicartSection.showCart}}" stepKey="openMiniCart"/>
48+
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="openMiniCart"/>
4949
<waitForElementVisible selector="{{StorefrontMinicartSection.quantity}}" stepKey="waitForElementQty"/>
5050
<pressKey selector="{{StorefrontMinicartSection.itemQuantity($$createProduct.name$$)}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::BACKSPACE]" stepKey="deleteFiled"/>
5151
<fillField selector="{{StorefrontMinicartSection.itemQuantity($$createProduct.name$$)}}" userInput="5" stepKey="changeQty"/>

0 commit comments

Comments
 (0)