Skip to content

Commit c644b3d

Browse files
gabrieldagamagabrieldagama
authored
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop latest changes
Accepted Community Pull Requests: - #30223: [MFTF] add ReloadPageActionGroup (by @Usik2203) - #27674: Backend: focus search field when pressing forwardslash - '/' (by @vovayatsyuk) - #27972: ISSUE-27954: Forgot password save user only one column (by @sheepfy) - #26966: Passing arguments for queues as expected (by @bartoszkubicki) - #30359: MFTF: Admin Delete CMS Block Test (by @DmitryTsymbal) - #26401: Add Event Prefix And Object To The Catalog Product Option Value Collection (by @sprankhub) - #28147: Introduce separate BlockByIdentifier class to get Layout Block based on CMS Block Identifier (by @lbajsarowicz) Fixed GitHub Issues: - #30683: [Issue] [MFTF] add ReloadPageActionGroup (reported by @m2-assistant[bot]) has been fixed in #30223 by @Usik2203 in 2.4-develop branch Related commits: 1. 9713cde 2. 52a288b 3. 9de5f78 4. bb7d50b 5. 73951dd - #29551: [Issue] Backend: focus search field when pressing forwardslash - '/' (reported by @m2-assistant[bot]) has been fixed in #27674 by @vovayatsyuk in 2.4-develop branch Related commits: 1. 73106d4 2. b445058 3. a17053a 4. d033021 5. 5021e2b 6. 0d002e3 7. a93afde 8. 50d421d 9. 3a19dca - #27954: Can't create/reset user password if user address is not valid (reported by @rafal-kos) has been fixed in #27972 by @sheepfy in 2.4-develop branch Related commits: 1. 29621ba 2. bc52285 3. 4f8f9f2 4. 09964ae 5. b7d5fa5 - #30216: [Issue] Passing arguments for queues as expected (reported by @m2-assistant[bot]) has been fixed in #26966 by @bartoszkubicki in 2.4-develop branch Related commits: 1. e91a3f1 2. 5ee0054 3. 00a03e9 4. d802328 - #30372: [Issue] MFTF: Admin Delete CMS Block Test (reported by @m2-assistant[bot]) has been fixed in #30359 by @DmitryTsymbal in 2.4-develop branch Related commits: 1. bebc574 2. 5ba03c2 - #29621: [Issue] Add Event Prefix And Object To The Catalog Product Option Value Collection (reported by @m2-assistant[bot]) has been fixed in #26401 by @sprankhub in 2.4-develop branch Related commits: 1. 7185e16 - #28309: [Issue] Introduce separate BlockByIdentifier class to get Layout Block based on CMS Block Identifier (reported by @m2-backlog[bot]) has been fixed in #28147 by @lbajsarowicz in 2.4-develop branch Related commits: 1. a100d24 2. 4501271 3. ae11a0c 4. 74b3e62 5. 4656d9e 6. 3e6bb4b 7. ab2be56 8. ac5ef07 9. cdcad5c 10. c3f7bed 11. 00cd00a 12. 5f3a2eb 13. 56b10a1 14. 6e2f90b 15. 476a551 16. d114bea 17. 4ad1ade 18. a851e7b
2 parents 05b2748 + 28ae9d7 commit c644b3d

File tree

41 files changed

+978
-110
lines changed

Some content is hidden

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

41 files changed

+978
-110
lines changed

‎app/code/Magento/Backend/Test/Mftf/Section/AdminHeaderSection.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
<section name="AdminHeaderSection">
1212
<element name="pageTitle" type="text" selector=".page-header h1.page-title"/>
1313
<element name="adminUserAccountText" type="text" selector=".page-header .admin-user-account-text" />
14+
<element name="globalSearchInput" type="text" selector="#search-global" />
15+
<element name="globalSearchInputVisible" type="text" selector=".search-global-field._active #search-global" />
1416
<!-- Legacy heading section. Mostly used for admin 404 and 403 pages -->
1517
<element name="pageHeading" type="text" selector=".page-content .page-heading"/>
1618
<!-- Used for page not found error -->

‎app/code/Magento/Backend/Test/Mftf/Test/AdminExpireAdminSessionTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<!-- 2. Wait for session to expire. -->
3030
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
3131
<wait time="60" stepKey="waitForSessionLifetime"/>
32-
<reloadPage stepKey="reloadPage"/>
32+
<actionGroup ref="ReloadPageActionGroup" stepKey="reloadPage"/>
3333

3434
<!-- 3. Perform asserts. -->
3535
<seeElement selector="{{AdminLoginFormSection.loginBlock}}" stepKey="assertAdminLoginPageIsAvailable"/>

‎app/code/Magento/Backend/Test/Mftf/Test/AdminExpireCustomerSessionTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<argument name="Customer" value="$$createCustomer$$" />
4141
</actionGroup>
4242
<wait time="60" stepKey="waitForCookieLifetime"/>
43-
<reloadPage stepKey="reloadPage"/>
43+
<actionGroup ref="ReloadPageActionGroup" stepKey="reloadPage"/>
4444

4545
<!-- 5. Perform asserts. -->
4646
<seeElement selector="{{StorefrontPanelHeaderSection.customerLoginLink}}" stepKey="assertAuthorizationLinkIsVisibleOnStoreFront"/>

‎app/code/Magento/Backend/Test/Mftf/Test/AdminSearchHotkeyTest.xml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminSearchHotkeyTest">
12+
<annotations>
13+
<features value="Backend"/>
14+
<stories value="Search form hotkey in backend"/>
15+
<title value="Admin should be able focus on the search field with a hotkey"/>
16+
<description value="Admin should be able focus on the search field with a hotkey - forwardslash"/>
17+
<severity value="MINOR"/>
18+
<group value="backend"/>
19+
<group value="search"/>
20+
</annotations>
21+
<before>
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
23+
</before>
24+
<after>
25+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
26+
</after>
27+
28+
<pressKey selector="body" parameterArray="[/]" stepKey="pressForwardslashKey"/>
29+
<seeElement selector="{{AdminHeaderSection.globalSearchInputVisible}}" stepKey="seeActiveGlobalSearchInput"/>
30+
<seeInField userInput="" selector="{{AdminHeaderSection.globalSearchInput}}" stepKey="seeEmptyGlobalSearchInput"/>
31+
<pressKey selector="{{AdminHeaderSection.globalSearchInput}}" parameterArray="[/]" stepKey="pressForwardslashKeyAgain"/>
32+
<seeInField userInput="/" selector="{{AdminHeaderSection.globalSearchInput}}" stepKey="seeForwardSlashInGlobalSearchInput"/>
33+
</test>
34+
</tests>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@
4646
<waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaField}}" stepKey="seeCaptchaField"/>
4747
<waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaImg}}" stepKey="seeCaptchaImage"/>
4848
<waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton"/>
49-
<reloadPage stepKey="refreshPage"/>
50-
<waitForPageLoad stepKey="waitForPageLoad2"/>
49+
50+
<actionGroup ref="ReloadPageActionGroup" stepKey="refreshPage"/>
51+
<comment userInput="Replacing reload action and preserve Backward Compatibility" stepKey="waitForPageLoad2" />
52+
5153
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickCart2"/>
5254
<click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout2"/>
5355
<waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.email}}" stepKey="waitEmailFieldVisible2"/>

‎app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value/Collection.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,20 @@
1414
*/
1515
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
1616
{
17+
/**
18+
* Name prefix of events that are dispatched by model
19+
*
20+
* @var string
21+
*/
22+
protected $_eventPrefix = 'catalog_product_option_value_collection';
23+
24+
/**
25+
* Name of event parameter
26+
*
27+
* @var string
28+
*/
29+
protected $_eventObject = 'product_option_value_collection';
30+
1731
/**
1832
* Resource initialization
1933
*

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<magentoCLI command="cron:run" stepKey="runCron"/>
9898

9999
<!-- 5. Open category A on Storefront again -->
100-
<reloadPage stepKey="reloadCategoryA"/>
100+
<actionGroup ref="ReloadPageActionGroup" stepKey="reloadCategoryA"/>
101101

102102
<!-- Category A displays product A1 now -->
103103
<see userInput="$$createCategoryA.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="seeTitleCategoryA1"/>
@@ -126,7 +126,7 @@
126126
<magentoCLI command="cron:run" stepKey="runCron1"/>
127127

128128
<!-- 9. Open category A on Storefront again -->
129-
<reloadPage stepKey="refreshCategoryAPage"/>
129+
<actionGroup ref="ReloadPageActionGroup" stepKey="refreshCategoryAPage"/>
130130

131131
<!-- Category A is empty now -->
132132
<see userInput="$$createCategoryA.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="seeOnPageCategoryAName"/>

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

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,10 @@
4040

4141
<!-- Assert single row - no hover state -->
4242
<createData entity="ApiCategoryA" stepKey="createFirstCategoryBlank"/>
43-
<reloadPage stepKey="refreshPage"/>
44-
<waitForPageLoad stepKey="waitForBlankSingleRowAppear"/>
43+
44+
<actionGroup ref="ReloadPageActionGroup" stepKey="refreshPage"/>
45+
<comment userInput="Replacing reload action and preserve Backward Compatibility" stepKey="waitForBlankSingleRowAppear"/>
46+
4547
<moveMouseOver selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createFirstCategoryBlank.name$$)}}" stepKey="hoverFirstCategoryBlank"/>
4648
<dontSeeElement selector="{{StorefrontNavigationMenuSection.subItemLevelHover('level0')}}" stepKey="assertNoHoverState"/>
4749

@@ -87,8 +89,9 @@
8789
</createData>
8890

8991
<!-- Several rows. Hover on category without children -->
90-
<reloadPage stepKey="reloadPage"/>
91-
<waitForPageLoad stepKey="waitForBlankSeveralRowsAppear"/>
92+
<actionGroup ref="ReloadPageActionGroup" stepKey="reloadPage"/>
93+
<comment userInput="Replacing reload action and preserve Backward Compatibility" stepKey="waitForBlankSeveralRowsAppear"/>
94+
9295
<moveMouseOver selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategoryWithoutChildrenBlank.name$$)}}" stepKey="hoverCategoryWithoutChildren"/>
9396
<dontSeeElement selector="{{StorefrontNavigationMenuSection.itemByNameAndLevel($$createCategoryWithoutChildrenBlank.name$$, 'level0')}}" stepKey="dontSeeChildrenInCategory"/>
9497

@@ -167,8 +170,9 @@
167170
<createData entity="ApiCategory" stepKey="createFourthCategoryLuma"/>
168171

169172
<!-- Single row. No hover state -->
170-
<reloadPage stepKey="reload"/>
171-
<waitForPageLoad stepKey="waitForLumaSingleRowAppear"/>
173+
<actionGroup ref="ReloadPageActionGroup" stepKey="reload"/>
174+
<comment userInput="Replacing reload action and preserve Backward Compatibility" stepKey="waitForLumaSingleRowAppear"/>
175+
172176
<dontSeeElement selector="{{StorefrontNavigationMenuSection.itemByNameAndLevel($$createFirstCategoryLuma.name$$, 'level0')}}" stepKey="noHoverStateInFirstCategory"/>
173177
<dontSeeElement selector="{{StorefrontNavigationMenuSection.itemByNameAndLevel($$createSecondCategoryLuma.name$$, 'level0')}}" stepKey="noHoverStateInSecondCategory"/>
174178
<dontSeeElement selector="{{StorefrontNavigationMenuSection.itemByNameAndLevel($$createThirdCategoryLuma.name$$, 'level0')}}" stepKey="noHoverStateThirdCategory"/>
@@ -203,8 +207,9 @@
203207
<createData entity="ApiCategory" stepKey="createEighthCategoryLuma"/>
204208

205209
<!-- Several rows. Hover on Category without children -->
206-
<reloadPage stepKey="refresh"/>
207-
<waitForPageLoad stepKey="waitForLumaSeveralRowsAppear"/>
210+
<actionGroup ref="ReloadPageActionGroup" stepKey="refresh"/>
211+
<comment userInput="Replacing reload action and preserve Backward Compatibility" stepKey="waitForLumaSeveralRowsAppear"/>
212+
208213
<moveMouseOver selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createFifthCategoryLuma.name$$)}}" stepKey="hoverOnCategoryWithoutChildren"/>
209214
<dontSeeElement selector="{{StorefrontNavigationMenuSection.itemByNameAndLevel($$createFifthCategoryLuma.name$$, 'level0')}}" stepKey="dontSeeSubcategoriesInCategory"/>
210215

‎app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldForUKCustomerRemainOptionAfterRefreshTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="guestGoToCheckoutFromMinicart" />
4343
<selectOption stepKey="selectCounty" selector="{{CheckoutShippingSection.country}}" userInput="{{UK_Address.country_id}}"/>
4444
<waitForPageLoad stepKey="waitFormToReload"/>
45-
<reloadPage stepKey="refreshPage"/>
46-
<waitForPageLoad stepKey="waitFormToReload1"/>
45+
<actionGroup ref="ReloadPageActionGroup" stepKey="refreshPage"/>
46+
<comment userInput="Replacing reload action and preserve Backward Compatibility" stepKey="waitFormToReload1" />
4747
<fillField selector="{{CheckoutShippingSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="enterEmail"/>
4848
<fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="enterFirstName"/>
4949
<fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="enterLastName"/>

‎app/code/Magento/Checkout/Test/Mftf/Test/AdminCheckConfigsChangesIsNotAffectedStartedCheckoutProcessTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@
9090

9191
<!-- Back to the Checkout and refresh the page -->
9292
<switchToPreviousTab stepKey="switchToPreviousTab"/>
93-
<reloadPage stepKey="refreshPage"/>
94-
<waitForPageLoad stepKey="waitPageReload"/>
93+
<actionGroup ref="ReloadPageActionGroup" stepKey="refreshPage"/>
94+
<comment userInput="Replacing reload action and preserve Backward Compatibility" stepKey="waitPageReload"/>
9595

9696
<!-- Payment step is opened after refreshing -->
9797
<waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPaymentSection"/>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,9 @@
172172
<actionGroup ref="CheckoutFillEstimateShippingAndTaxActionGroup" stepKey="fillEstimateShippingAndTaxFields">
173173
<argument name="address" value="US_Address_NY_Default_Shipping"/>
174174
</actionGroup>
175-
<reloadPage stepKey="reloadThePage"/>
176-
<waitForPageLoad stepKey="waitForPageToReload"/>
175+
<actionGroup ref="ReloadPageActionGroup" stepKey="reloadThePage"/>
176+
<comment userInput="Replacing reload action and preserve Backward Compatibility" stepKey="waitForPageToReload"/>
177+
177178
<waitForText selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$9.60" time="90" stepKey="waitForTaxAmount"/>
178179

179180
<!--Select Free Shipping and proceed to checkout -->

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontPersistentDataForGuestCustomerWithPhysicalQuoteTest.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearAfterFlatRateSelection"/>
5050
<see selector="{{CheckoutCartSummarySection.total}}" userInput="15" stepKey="assertOrderTotalField"/>
5151
<!-- 5. Refresh browser page (F5) -->
52-
<reloadPage stepKey="reloadPage"/>
53-
<waitForPageLoad stepKey="waitForPageLoad"/>
52+
<actionGroup ref="ReloadPageActionGroup" stepKey="reloadPage"/>
53+
<comment userInput="Replacing reload action and preserve Backward Compatibility" stepKey="waitForPageLoad"/>
5454
<actionGroup ref="StorefrontAssertCartEstimateShippingAndTaxActionGroup" stepKey="assertCartEstimateShippingAndTaxAfterPageReload"/>
5555
<actionGroup ref="StorefrontAssertCartShippingMethodSelectedActionGroup" stepKey="assertFlatRateShippingMethodIsChecked">
5656
<argument name="carrierCode" value="flatrate"/>
@@ -71,8 +71,9 @@
7171
<!-- 9. Fill other fields -->
7272
<actionGroup ref="StorefrontFillGuestShippingInfoActionGroup" stepKey="fillOtherFieldsInCheckoutShippingSection"/>
7373
<!-- 10. Refresh browser page(F5) -->
74-
<reloadPage stepKey="reloadCheckoutPage"/>
75-
<waitForPageLoad stepKey="waitForCheckoutPageLoad"/>
74+
<actionGroup ref="ReloadPageActionGroup" stepKey="reloadCheckoutPage"/>
75+
<comment userInput="Replacing reload action and preserve Backward Compatibility" stepKey="waitForCheckoutPageLoad"/>
76+
7677
<actionGroup ref="StorefrontAssertGuestShippingInfoActionGroup" stepKey="assertGuestShippingPersistedInfoAfterReloadingCheckoutShippingPage"/>
7778
<actionGroup ref="StorefrontAssertCheckoutShippingMethodSelectedActionGroup" stepKey="assertFreeShippingShippingMethodIsChecked">
7879
<argument name="shippingMethod" value="Free Shipping"/>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdatePriceInShoppingCartAfterProductSaveTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
<closeTab stepKey="closeTab"/>
6363

6464
<!--Check price-->
65-
<reloadPage stepKey="reloadPage"/>
66-
<waitForPageLoad stepKey="waitForCheckoutPageReload"/>
65+
<actionGroup ref="ReloadPageActionGroup" stepKey="reloadPage"/>
66+
<comment userInput="Replacing reload action and preserve Backward Compatibility" stepKey="waitForCheckoutPageReload"/>
6767
<conditionalClick selector="{{CheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{CheckoutPaymentSection.cartItemsAreaActive}}" visible="false" stepKey="openItemProductBlock1"/>
6868
<see userInput="$120.00" selector="{{CheckoutPaymentSection.orderSummarySubtotal}}" stepKey="checkSummarySubtotal1"/>
6969
<see userInput="$120.00" selector="{{CheckoutPaymentSection.productItemPriceByName($$createSimpleProduct.name$$)}}" stepKey="checkItemPrice1"/>

‎app/code/Magento/Cms/Block/Block.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
/**
1212
* Cms block content block
13+
* @deprecated This class introduces caching issues and should no longer be used
14+
* @see \Magento\Cms\Block\BlockByIdentifier
1315
*/
1416
class Block extends AbstractBlock implements \Magento\Framework\DataObject\IdentityInterface
1517
{

0 commit comments

Comments
 (0)