Skip to content

Commit 5d8908c

Browse files
magento-engcom-teammagento-engcom-team
authored
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop latest changes
Accepted Community Pull Requests: - #29829: [MFTF] add new AdminOpenWebConfigurationPageActionGroup (by @Usik2203) - #29821: [MFTF] use AdminOpenCreateNewCMSPageActionGroup for navigation to create new cms page (by @Usik2203) - #29832: [MFTF] use ActionGroup for navigation to checkout page (by @Usik2203) - #29830: [MFTF] add new AdminOpenAdminThreeDSecurePageActionGroup (by @Usik2203) - #29828: [MFTF] add new AdminOpenGeneralConfigurationPageActionGroup (by @Usik2203) - #29820: [MFTF] Added new ActionGroup for clicking AddToCart button (by @Usik2203) - #25244: #25192 fixed (by @vishalverma279) - #28343: Added missing aclResource attribute to Backend Header AdminNotification Toolbar Block (by @denysbabenko) - #27129: Improve performance of "in" condition on some version of MySQl (by @kandy) - #27269: #26288 Throw an exception when a customer does not exist requests password reset (by @Bal2018) Fixed GitHub Issues: - #29846: [Issue] [MFTF] add new AdminOpenWebConfigurationPageActionGroup (reported by @m2-assistant[bot]) has been fixed in #29829 by @Usik2203 in 2.4-develop branch Related commits: 1. 66184fd 2. 81ef092 3. d76e664 - #29824: [Issue] [MFTF] use AdminOpenCreateNewCMSPageActionGroup for navigation to create new cms page (reported by @m2-assistant[bot]) has been fixed in #29821 by @Usik2203 in 2.4-develop branch Related commits: 1. 6e7914f 2. e23ab45 3. 7aa7f6e - #29843: [Issue] [MFTF] use ActionGroup for navigation to checkout page (reported by @m2-assistant[bot]) has been fixed in #29832 by @Usik2203 in 2.4-develop branch Related commits: 1. 45f834c 2. ce4caae 3. 9ae704d - #29845: [Issue] [MFTF] add new AdminOpenAdminThreeDSecurePageActionGroup (reported by @m2-assistant[bot]) has been fixed in #29830 by @Usik2203 in 2.4-develop branch Related commits: 1. 3cfa6aa 2. c0241d4 - #29847: [Issue] [MFTF] add new AdminOpenGeneralConfigurationPageActionGroup (reported by @m2-assistant[bot]) has been fixed in #29828 by @Usik2203 in 2.4-develop branch Related commits: 1. ef7b93b 2. a77b364 - #29823: [Issue] [MFTF] Added new ActionGroup for clicking AddToCart button (reported by @m2-assistant[bot]) has been fixed in #29820 by @Usik2203 in 2.4-develop branch Related commits: 1. 8e6cb13 2. 0eff627 - #25192: DHL Shipping (reported by @insaurabh) has been fixed in #25244 by @vishalverma279 in 2.4-develop branch Related commits: 1. 4ac223b 2. a220df1 3. ab97e97 4. cef3fe7 - #29067: [Issue] Added missing aclResource attribute to Backend Header AdminNotification Toolbar Block (reported by @m2-assistant[bot]) has been fixed in #28343 by @denysbabenko in 2.4-develop branch Related commits: 1. 7ad6cdf 2. cff0e98 3. 9694e2a 4. 3d3c5c4 5. 407fb74 6. e495a51 7. 274103d 8. 44963c2 9. 205c088 10. 0bbc990 11. 0649a6f 12. 8ad66e1 - #25199: Catalog Category Indexing takes very long on MariaDB 10.3 with many products (reported by @amenk) has been fixed in #27129 by @kandy in 2.4-develop branch Related commits: 1. f70f1d2 2. 27e1c6e 3. 4a22091 4. a36c9a9 5. 1515252 6. f2bba37 7. e099ad1 8. 00f1377 9. 6587c57 10. fd21e1f 11. e17a4b6 12. 9e1b438 13. 503f0bd 14. 912cfd8 15. 05e0e15 16. 18f7d85 17. 12d3ebf 18. 88f10c5 19. b7722a1 20. d7fdd07 - #26288: missing Throw in copy pasted code (reported by @angelomaragna) has been fixed in #27269 by @Bal2018 in 2.4-develop branch Related commits: 1. de530f7 2. f44add2 3. 1bd7d1e 4. 5d11fdc 5. 4595009 6. d30e5e2 7. 000c822 8. 239037a 9. baf892e 10. c3855c8 11. bcc29ed
2 parents ddf3c62 + d1f0447 commit 5d8908c

File tree

91 files changed

+884
-410
lines changed

Some content is hidden

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

91 files changed

+884
-410
lines changed

‎app/code/Magento/AdminNotification/Test/Mftf/Section/AdminNotificationToolbarSection.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminNotificationToolbarSection">
12+
<element name="notification" type="block" selector=".notifications-wrapper.admin__action-dropdown-wrap"/>
13+
<element name="notificationCounter" type="block" selector=".notifications-action.admin__action-dropdown .notifications-counter"/>
14+
</section>
15+
</sections>

‎app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationToolbarBlockAclTest.xml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
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="AdminSystemNotificationToolbarBlockAclTest">
12+
<annotations>
13+
<features value="AdminNotification"/>
14+
<stories value="Acl notification toolbar"/>
15+
<title value="Admin system notification toolbar block acl test"/>
16+
<description value="Admin should not see system notification toolbar block if acl not restricted"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="MC-36011"/>
19+
<group value="menu"/>
20+
</annotations>
21+
<before>
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
23+
24+
<actionGroup ref="AdminFillUserRoleRequiredDataActionGroup" stepKey="fillUserRoleRequiredData">
25+
<argument name="User" value="adminRole"/>
26+
<argument name="restrictedRole" value="Stores"/>
27+
</actionGroup>
28+
<actionGroup ref="AdminUserClickRoleResourceTabActionGroup" stepKey="goToRoleResourcesTab" />
29+
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="addRestrictedRoleStores">
30+
<argument name="User" value="adminRole"/>
31+
<argument name="restrictedRole" value="Products"/>
32+
</actionGroup>
33+
<actionGroup ref="AdminUserSaveRoleActionGroup" stepKey="saveUserRole" />
34+
35+
<actionGroup ref="AdminCreateUserActionGroup" stepKey="createAdminUser">
36+
<argument name="role" value="adminRole"/>
37+
<argument name="User" value="admin2"/>
38+
</actionGroup>
39+
40+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
41+
</before>
42+
<after>
43+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAsSaleRoleUser"/>
44+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
45+
<!--Delete created data-->
46+
<actionGroup ref="AdminUserOpenAdminRolesPageActionGroup" stepKey="navigateToUserRoleGrid"/>
47+
<actionGroup ref="AdminDeleteRoleActionGroup" stepKey="deleteUserRole">
48+
<argument name="role" value="adminRole"/>
49+
</actionGroup>
50+
<actionGroup ref="AdminOpenAdminUsersPageActionGroup" stepKey="goToAllUsersPage"/>
51+
<actionGroup ref="AdminDeleteNewUserActionGroup" stepKey="deleteUser">
52+
<argument name="userName" value="{{admin2.username}}"/>
53+
</actionGroup>
54+
</after>
55+
56+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsNewUser">
57+
<argument name="username" value="{{admin2.username}}"/>
58+
<argument name="password" value="{{admin2.password}}"/>
59+
</actionGroup>
60+
61+
<waitForPageLoad stepKey="waitBeforePageLoad"/>
62+
<dontSeeElement selector="{{AdminNotificationToolbarSection.notification}}" stepKey="doNotSeeNotificationBellIcon"/>
63+
</test>
64+
</tests>

‎app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@
2020
template="Magento_AdminNotification::notification/window.phtml"/>
2121
</referenceContainer>
2222
<referenceContainer name="header">
23-
<block class="Magento\AdminNotification\Block\ToolbarEntry" name="notification.messages" before="user" template="Magento_AdminNotification::toolbar_entry.phtml"/>
23+
<block class="Magento\AdminNotification\Block\ToolbarEntry"
24+
name="notification.messages"
25+
before="user"
26+
aclResource="Magento_AdminNotification::show_toolbar"
27+
template="Magento_AdminNotification::toolbar_entry.phtml"/>
2428
</referenceContainer>
2529
</body>
2630
</page>

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminOpenGeneralConfigurationPageActionGroup.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="AdminOpenGeneralConfigurationPageActionGroup">
12+
<annotations>
13+
<description>Open general configuration page.</description>
14+
</annotations>
15+
16+
<amOnPage url="{{GeneralConfigurationPage.url}}" stepKey="openGeneralConfigurationPage"/>
17+
<waitForPageLoad stepKey="waitForPageLoad"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminOpenWebConfigurationPageActionGroup.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="AdminOpenWebConfigurationPageActionGroup">
12+
<annotations>
13+
<description>Open web configuration page.</description>
14+
</annotations>
15+
16+
<amOnPage url="{{WebConfigurationPage.url}}" stepKey="openWebConfigurationPage"/>
17+
<waitForPageLoad stepKey="waitPageToLoad"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ public function joinPrices($websiteId)
215215
public function setOptionIdsFilter($optionIds)
216216
{
217217
if (!empty($optionIds)) {
218-
$this->getSelect()->where('selection.option_id IN (?)', $optionIds);
218+
$this->getSelect()->where('selection.option_id IN (?)', $optionIds, \Zend_Db::INT_TYPE);
219219
}
220220
return $this;
221221
}
@@ -229,7 +229,7 @@ public function setOptionIdsFilter($optionIds)
229229
public function setSelectionIdsFilter($selectionIds)
230230
{
231231
if (!empty($selectionIds)) {
232-
$this->getSelect()->where('selection.selection_id IN (?)', $selectionIds);
232+
$this->getSelect()->where('selection.selection_id IN (?)', $selectionIds, \Zend_Db::INT_TYPE);
233233
}
234234
return $this;
235235
}

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

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

7272
<!--Click add to cart-->
7373
<moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
74-
<click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addProductToCart"/>
75-
<waitForPageLoad stepKey="waitForProductPage"/>
74+
<actionGroup ref="StorefrontClickAddToCartButtonActionGroup" stepKey="addProductToCart"/>
7675

7776
<!--Check for details page-->
7877
<seeInCurrentUrl url="{{BundleProduct.sku}}" stepKey="seeBundleProductDetailsPage"/>

‎app/code/Magento/BundleGraphQl/Model/Resolver/Links/Collection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ private function fetch() : array
108108
}
109109

110110
$linkCollection->getSelect()
111-
->where($field . ' IN (?)', $this->parentIds);
111+
->where($field . ' IN (?)', $this->parentIds, \Zend_Db::INT_TYPE);
112112

113113
/** @var Selection $link */
114114
foreach ($linkCollection as $link) {

‎app/code/Magento/CardinalCommerce/Test/Mftf/ActionGroup/AdminOpenAdminThreeDSecurePageActionGroup.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="AdminOpenAdminThreeDSecurePageActionGroup">
12+
<annotations>
13+
<description>Open ThreeDSecure page.</description>
14+
</annotations>
15+
16+
<amOnPage url="{{AdminThreeDSecurePage.url}}" stepKey="openAdminThreeDSecurePage"/>
17+
<waitForPageLoad stepKey="waitThreeDSecurePageToLoad"/>
18+
</actionGroup>
19+
</actionGroups>

0 commit comments

Comments
 (0)