Skip to content

Commit a3c2af0

Browse files
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop
Accepted Community Pull Requests: - #26779: Fix failure for missing product on Storefront (by @lbajsarowicz) - #27054: Cleanup ObjectManager usage - Magento_Authorization (by @Bartlomiejsz) - #27048: #27044 Integration Test to cover `$storeId` on Category Repository `get()` (by @lbajsarowicz) - #27041: FIX: responsiveness for images (by @GrimLink) - #25359: Fix #25243 (by @korostii) - #24784: Fix #20332 - address fields sort order fixes (by @Bartlomiejsz) - #27010: Unit test for UpdateElementTypesObserver (by @mmezhensky) - #27021: Unit test for \Magento\MediaGallery\Plugin\Product\Gallery\Processor (by @karyna-tsymbal-atwix) - #26765: Fix #17933 - Bank Transfer Payment Instructions switch back to default (by @Bartlomiejsz) - #26548: issue/26384 Fix store switcher when using different base url on stores (by @TobiasCodeNull) - #24003: Fixes less compilation problems in the Magento/luma theme (by @hostep) - #26329: MFTF: Replace invalid ActionGroup for AdminLogin (by @lbajsarowicz) Fixed GitHub Issues: - #27044: BUG: Category Repository get()'s argument `store_id` does not work (reported by @lbajsarowicz) has been fixed in #27048 by @lbajsarowicz in 2.4-develop branch Related commits: 1. 2d15e91 2. 8ad33f5 - #27040: Images no longer responsive (reported by @GrimLink) has been fixed in #27041 by @GrimLink in 2.4-develop branch Related commits: 1. 691d7bb 2. 6209f35 3. bf78c2c 4. 7e096c2 - #25243: Numerical placeholder count in Phrase starts with %1, however js code assumes 0% (reported by @vitcra) has been fixed in #25359 by @korostii in 2.4-develop branch Related commits: 1. 2596ca7 2. 2f5909e 3. d1b63cb 4. f08857b 5. 71ca4bb 6. d79bf5e 7. 3d36928 8. 9db06e5 9. df48d3e 10. 9ccac04 11. ce19171 - #20332: Shipping address form City, State/Province, Zip/Postal Code, Country not in right Order in checkout (reported by @swetacedcoss) has been fixed in #24784 by @Bartlomiejsz in 2.4-develop branch Related commits: 1. 2d759c0 - #17933: Bank Transer Payment Instuctions switch back to default (reported by @rstylenl) has been fixed in #26765 by @Bartlomiejsz in 2.4-develop branch Related commits: 1. 7c4be6a - #23755: Store view switcher is wrong , when each store views have different url. (reported by @Taku-Yamashita) has been fixed in #26548 by @TobiasCodeNull in 2.4-develop branch Related commits: 1. 346e544 2. 392bd3b 3. 0cbc5b6 4. 420fa1c 5. 1375b53 6. 9cad4dc 7. 6024195 8. ee97fb5 9. 689093a 10. 4708394 11. 597bb18 12. 0fcb6a0 - #26384: Store switcher redirects to homepage for multistore setup with different domains (reported by @DanieliMi) has been fixed in #26548 by @TobiasCodeNull in 2.4-develop branch Related commits: 1. 346e544 2. 392bd3b 3. 0cbc5b6 4. 420fa1c 5. 1375b53 6. 9cad4dc 7. 6024195 8. ee97fb5 9. 689093a 10. 4708394 11. 597bb18 12. 0fcb6a0 - #23619: Less compilation extend 'mixin' has no matches (reported by @patruvlad) has been fixed in #24003 by @hostep in 2.4-develop branch Related commits: 1. 820fd79 2. 164a053 3. 8419d5c 4. 4abaaa0 5. 5657076 - #26331: [ MFTF ] Mess in ActionGroups: invalid names, multiple nodes. (reported by @lbajsarowicz) has been fixed in #26329 by @lbajsarowicz in 2.4-develop branch Related commits: 1. aa1271b 2. d013eff 3. 5cd51d4 4. d1a5d56 5. e48c617 6. 79797a7 7. 7c4b59b
2 parents 3455667 + aed9a17 commit a3c2af0

File tree

808 files changed

+2281
-1516
lines changed

Some content is hidden

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

808 files changed

+2281
-1516
lines changed

app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/LoginAsAdminActionGroup.xml renamed to app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/AdminLoginActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="LoginAsAdmin">
11+
<actionGroup name="AdminLoginActionGroup">
1212
<conditionalClick selector="{{AdminUsageNotificationSection.adminUsageDontAllowButton}}" dependentSelector="{{AdminUsageNotificationSection.adminUsageDontAllowButton}}" visible="true" stepKey="clickDontAllowButtonIfVisible" before="closeAdminNotification"/>
1313
</actionGroup>
1414
</actionGroups>
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="LoginAdminWithCredentialsActionGroup">
11+
<actionGroup name="LoginAdminWithCredentialsActionGroup" deprecated="Use AdminLoginActionGroup instead">
12+
<conditionalClick selector="{{AdminUsageNotificationSection.adminUsageDontAllowButton}}" dependentSelector="{{AdminUsageNotificationSection.adminUsageDontAllowButton}}" visible="true" stepKey="clickDontAllowButtonIfVisible" before="closeAdminNotification"/>
13+
</actionGroup>
14+
<actionGroup name="LoginAsAdmin" deprecated="Use AdminLoginActionGroup instead">
1215
<conditionalClick selector="{{AdminUsageNotificationSection.adminUsageDontAllowButton}}" dependentSelector="{{AdminUsageNotificationSection.adminUsageDontAllowButton}}" visible="true" stepKey="clickDontAllowButtonIfVisible" before="closeAdminNotification"/>
1316
</actionGroup>
1417
</actionGroups>

app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationNavigateMenuTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
2424
</before>
2525
<after>
26-
<actionGroup ref="logout" stepKey="logout"/>
26+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
2727
</after>
2828
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemNotificationPage">
2929
<argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>

app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
2626
</before>
2727
<after>
28-
<actionGroup ref="logout" stepKey="logout"/>
28+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
2929
</after>
3030

3131
<!--Navigate through Advanced Reporting button on dashboard to Sign Up page-->
@@ -35,4 +35,4 @@
3535
<switchToNextTab stepKey="switchToNewTab"/>
3636
<seeInCurrentUrl url="advancedreporting.rjmetrics.com/report" stepKey="seeAssertAdvancedReportingPageUrl"/>
3737
</test>
38-
</tests>
38+
</tests>

app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingNavigateMenuTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
2424
</before>
2525
<after>
26-
<actionGroup ref="logout" stepKey="logout"/>
26+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
2727
</after>
2828
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateAdvancedReportingPage">
2929
<argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>

app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<group value="analytics"/>
1919
</annotations>
2020
<after>
21-
<actionGroup ref="logout" stepKey="logoutOfAdmin"/>
21+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
2222
</after>
23-
<actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
23+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2424
<amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
2525
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
2626
<see selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustryLabel}}" userInput="Industry" stepKey="seeAdvancedReportingIndustryLabel"/>

app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<group value="analytics"/>
1919
</annotations>
2020
<after>
21-
<actionGroup ref="logout" stepKey="logoutOfAdmin"/>
21+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
2222
</after>
23-
<actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
23+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2424
<amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
2525
<see selector="{{AdminConfigAdvancedReportingSection.advancedReportingServiceLabel}}" userInput="Advanced Reporting Service" stepKey="seeAdvancedReportingServiceLabelEnabled"/>
2626
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>

app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<group value="analytics"/>
2020
</annotations>
2121

22-
<actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2323
<amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
2424
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
2525
<see selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustryLabel}}" userInput="Industry" stepKey="seeAdvancedReportingIndustryLabel"/>

app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
<before>
2222
<createData entity="adminNoReportRole" stepKey="noReportUserRole"/>
2323
<createData entity="adminNoReport" stepKey="noReportUser"/>
24-
<actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
24+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2525
</before>
2626
<after>
27-
<actionGroup ref="logout" stepKey="logoutOfAdmin"/>
27+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
2828
</after>
2929
<amOnPage url="{{AdminUsersPage.url}}" stepKey="amOnAdminUsersPage"/>
3030
<fillField selector="{{AdminUserGridSection.usernameFilterTextField}}" userInput="$$noReportUser.username$$" stepKey="fillUsernameSearch"/>
@@ -51,7 +51,7 @@
5151
<scrollTo selector="{{AdminConfigAdvancedReportingSection.advancedReportingMenuItem}}" stepKey="scrollToMenuItem"/>
5252
<!--<see stepKey="seeAdvancedReportingConfigMenuItem" selector="{{AdminConfigAdvancedReportingSection.advancedReportingMenuItem}}" userInput="Advanced Reporting"/>-->
5353
<seeElementInDOM selector="{{AdminConfigAdvancedReportingSection.advancedReportingMenuItem}}" stepKey="seeAdvancedReportingConfigMenuItem"/>
54-
<actionGroup ref="logout" stepKey="logoutOfAdmin2"/>
54+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin2"/>
5555

5656
<amOnPage url="{{AdminLoginPage.url}}" stepKey="amOnAdminLoginPage"/>
5757
<fillField selector="{{AdminLoginFormSection.username}}" userInput="$$noReportUser.username$$" stepKey="fillUsernameNoReport"/>

app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<group value="analytics"/>
2020
</annotations>
2121
<after>
22-
<actionGroup ref="logout" stepKey="logoutOfAdmin"/>
22+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
2323
</after>
24-
<actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
24+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2525
<amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
2626
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
2727
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustry}}" userInput="Apps and Games" stepKey="selectAdvancedReportingIndustry"/>

0 commit comments

Comments
 (0)