Skip to content

Commit 78117a4

Browse files
soumyausoumyau
committed
Merge remote-tracking branch 'origin/2.4-develop' into MQE-1993
# Conflicts: # app/code/Magento/CatalogRule/Test/Mftf/Test/CatalogPriceRuleAndCustomerGroupMembershipArePersistedUnderLongTermCookieTest.xml # app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml # app/code/Magento/CatalogRuleConfigurable/Test/Mftf/Test/AdminApplyCatalogRuleForConfigurableProductWithOptions2Test.xml # app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml # app/code/Magento/Sales/Test/Mftf/Test/AdminReorderWithCatalogPriceRuleDiscountTest.xml
2 parents 2bd9336 + 6bcc25b commit 78117a4

File tree

986 files changed

+10628
-3182
lines changed

Some content is hidden

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

986 files changed

+10628
-3182
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"/>

0 commit comments

Comments
 (0)