Skip to content

Commit aed9a17

Browse files
magento-engcom-teammagento-engcom-team
authored
[Magento Community Engineering] Community Contributions - 2.4-develop-prs
 - merged with '2.4-develop-expedited-prs' branch
2 parents c80f305 + 7110fda commit aed9a17

File tree

777 files changed

+960
-966
lines changed

Some content is hidden

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

777 files changed

+960
-966
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>

‎app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/LoginAdminWithCredentialsActionGroup.xml renamed to ‎app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/_Deprecated_ActionGroup.xml

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"/>

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,20 @@
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
<annotations>
1313
<description>Login to Backend Admin using provided User Data. PLEASE NOTE: This Action Group does NOT validate that you are Logged In.</description>
1414
</annotations>
1515
<arguments>
16-
<argument name="adminUser" type="entity" defaultValue="DefaultAdminUser"/>
16+
<argument name="username" type="string" defaultValue="{{_ENV.MAGENTO_ADMIN_USERNAME}}"/>
17+
<argument name="password" type="string" defaultValue="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
1718
</arguments>
1819

1920
<amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
20-
<fillField selector="{{AdminLoginFormSection.username}}" userInput="{{adminUser.username}}" stepKey="fillUsername"/>
21-
<fillField selector="{{AdminLoginFormSection.password}}" userInput="{{adminUser.password}}" stepKey="fillPassword"/>
21+
<fillField selector="{{AdminLoginFormSection.username}}" userInput="{{username}}" stepKey="fillUsername"/>
22+
<fillField selector="{{AdminLoginFormSection.password}}" userInput="{{password}}" stepKey="fillPassword"/>
2223
<click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
24+
2325
<closeAdminNotification stepKey="closeAdminNotification"/>
2426
</actionGroup>
2527
</actionGroups>

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginActionGroup.xml

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAdminWithCredentialsActionGroup.xml

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/LogoutActionGroup.xml

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/_Deprecated_ActionGroup.xml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
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="LoginAsAnyUser" deprecated="Use LoginAdminWithCredentialsActionGroup instead">
12+
<arguments>
13+
<argument name="uname" type="string" defaultValue="{{_ENV.MAGENTO_ADMIN_USERNAME}}"/>
14+
<argument name="passwd" type="string" defaultValue="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
15+
</arguments>
16+
<amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}" stepKey="navigateToAdmin"/>
17+
<fillField userInput="{{uname}}" selector="{{LoginFormSection.username}}" stepKey="fillUsername"/>
18+
<fillField userInput="{{passwd}}" selector="{{LoginFormSection.password}}" stepKey="fillPassword"/>
19+
<click selector="{{LoginFormSection.signIn}}" stepKey="clickLogin"/>
20+
</actionGroup>
21+
22+
<actionGroup name="logout" deprecated="Use AdminLogoutActionGroup instead" extends="AdminLogoutActionGroup"/>
23+
24+
<actionGroup name="LoginAsAdmin" deprecated="Use AdminLoginActionGroup instead">
25+
<annotations>
26+
<description>Login to Backend Admin using provided User Data. PLEASE NOTE: This Action Group does NOT validate that you are Logged In.</description>
27+
</annotations>
28+
<arguments>
29+
<argument name="adminUser" type="entity" defaultValue="DefaultAdminUser"/>
30+
</arguments>
31+
32+
<amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
33+
<fillField selector="{{AdminLoginFormSection.username}}" userInput="{{adminUser.username}}" stepKey="fillUsername"/>
34+
<fillField selector="{{AdminLoginFormSection.password}}" userInput="{{adminUser.password}}" stepKey="fillPassword"/>
35+
<click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
36+
<closeAdminNotification stepKey="closeAdminNotification"/>
37+
</actionGroup>
38+
39+
<actionGroup name="LoginActionGroup" deprecated="Use AdminLoginActionGroup instead" extends="AdminLoginActionGroup"/>
40+
41+
<actionGroup name="LoginAdminWithCredentialsActionGroup" deprecated="Use AdminLoginActionGroup">
42+
<annotations>
43+
<description>Login to Backend Admin using provided Admin credentials. PLEASE NOTE: This Action Group does NOT validate that you are Logged In.</description>
44+
</annotations>
45+
<arguments>
46+
<argument name="adminUser" type="string"/>
47+
<argument name="adminPassword" type="string"/>
48+
</arguments>
49+
50+
<amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}" stepKey="navigateToAdmin"/>
51+
<fillField selector="{{AdminLoginFormSection.username}}" userInput="{{adminUser}}" stepKey="fillUsername"/>
52+
<fillField selector="{{AdminLoginFormSection.password}}" userInput="{{adminPassword}}" stepKey="fillPassword"/>
53+
<click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
54+
<closeAdminNotification stepKey="closeAdminNotification"/>
55+
</actionGroup>
56+
</actionGroups>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<argument name="customStore" value="storeViewData7"/>
5959
</actionGroup>
6060

61-
<actionGroup ref="logout" stepKey="logout"/>
61+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
6262
</after>
6363

6464
<!-- Create 10 store views -->

‎app/code/Magento/Backend/Test/Mftf/Test/AdminContentScheduleNavigateMenuTest.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="navigateToContentSchedulePage">
2929
<argument name="menuUiId" value="{{AdminMenuContent.dataUiId}}"/>

‎app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardNavigateMenuTest.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
<waitForPageLoad stepKey="waitForPageLoad"/>
2929
<click selector="{{AdminMenuSection.menuItem(AdminMenuDashboard.dataUiId)}}" stepKey="clickOnMenuItem"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<magentoCLI command="config:set admin/dashboard/enable_charts 0" stepKey="setDisableChartsAsDefault"/>
3838
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
3939
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
40-
<actionGroup ref="logout" stepKey="logout"/>
40+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4141
</after>
4242
<!-- Login as admin -->
4343
<comment userInput="Login as admin" stepKey="adminLogin"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<magentoCLI command="config:set {{DefaultWebCookieLifetimeConfigData.path}} {{DefaultWebCookieLifetimeConfigData.value}}" stepKey="setDefaultCookieLifetime"/>
2525
<!-- Delete data -->
2626
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
27-
<actionGroup ref="logout" stepKey="logout"/>
27+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
2828
</after>
2929
<!-- 1. Login to Admin. -->
3030
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@
2929
</after>
3030
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
3131
<actionGroup ref="AssertAdminDashboardPageIsVisibleActionGroup" stepKey="seeDashboardPage"/>
32-
<actionGroup ref="logout" stepKey="logoutFromAdmin"/>
32+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
3333
</test>
3434
</tests>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</before>
2727
<after>
2828
<magentoCLI command="config:set {{MinifyJavaScriptFilesDisableConfigData.path}} {{MinifyJavaScriptFilesDisableConfigData.value}}" stepKey="disableJsMinification"/>
29-
<actionGroup ref="logout" stepKey="logout"/>
29+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3030
</after>
3131
<see userInput="Dashboard" selector="{{AdminHeaderSection.pageTitle}}" stepKey="seeDashboardTitle"/>
3232
<waitForPageLoad stepKey="waitForPageLoadOnDashboard"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222

2323
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2424
<seeInCurrentUrl url="{{AdminLoginPage.url}}" stepKey="seeAdminLoginUrl"/>
25-
<actionGroup ref="logout" stepKey="logoutFromAdmin"/>
25+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
2626
</test>
2727
</tests>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</actionGroup>
4040
</before>
4141
<after>
42-
<actionGroup ref="logout" stepKey="logoutAsSaleRoleUser"/>
42+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAsSaleRoleUser"/>
4343
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
4444
<!--Delete created data-->
4545
<actionGroup ref="AdminUserOpenAdminRolesPageActionGroup" stepKey="navigateToUserRoleGrid"/>
@@ -52,7 +52,7 @@
5252
</actionGroup>
5353
</after>
5454
<!--Log out of admin and login with newly created user-->
55-
<actionGroup ref="logout" stepKey="logoutOfAdmin"/>
55+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
5656
<actionGroup ref="LoginAsAdmin" stepKey="loginAsNewUser">
5757
<argument name="adminUser" value="admin2"/>
5858
</actionGroup>

0 commit comments

Comments
 (0)