-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ENGCOM-4679: Fix #12802 - allow to override preference over CartInter…
…face and return correct object from QuoteRepository #22149 - Merge Pull Request #22149 from Bartlomiejsz/magento2:feature/fix_12802_quote_not_overridable - Merged commits: 1. 865d7df 2. 6e079a3 3. fa5cf90
- Loading branch information
Showing
572 changed files
with
16,871 additions
and
4,897 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
app/code/Magento/AdminNotification/Test/Mftf/Data/AdminMenuData.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd"> | ||
| <entity name="AdminMenuSystem"> | ||
| <data key="pageTitle">System</data> | ||
| <data key="title">Notifications</data> | ||
| <data key="dataUiId">magento-backend-system</data> | ||
| </entity> | ||
| <entity name="AdminMenuSystemOtherSettingsNotifications"> | ||
| <data key="pageTitle">Notifications</data> | ||
| <data key="title">Notifications</data> | ||
| <data key="dataUiId">magento-adminnotification-system-adminnotification</data> | ||
| </entity> | ||
| </entities> |
36 changes: 36 additions & 0 deletions
36
...code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationNavigateMenuTest.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> | ||
| <test name="AdminSystemNotificationNavigateMenuTest"> | ||
| <annotations> | ||
| <features value="AdminNotification"/> | ||
| <stories value="Menu Navigation"/> | ||
| <title value="Admin system notification navigate menu test"/> | ||
| <description value="Admin should be able to navigate to System > Notifications"/> | ||
| <severity value="CRITICAL"/> | ||
| <testCaseId value="MC-14125"/> | ||
| <group value="menu"/> | ||
| <group value="mtf_migrated"/> | ||
| </annotations> | ||
| <before> | ||
| <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/> | ||
| </before> | ||
| <after> | ||
| <actionGroup ref="logout" stepKey="logout"/> | ||
| </after> | ||
| <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemNotificationPage"> | ||
| <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/> | ||
| <argument name="submenuUiId" value="{{AdminMenuSystemOtherSettingsNotifications.dataUiId}}"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle"> | ||
| <argument name="title" value="{{AdminMenuSystemOtherSettingsNotifications.pageTitle}}"/> | ||
| </actionGroup> | ||
| </test> | ||
| </tests> |
21 changes: 21 additions & 0 deletions
21
app/code/Magento/Analytics/Test/Mftf/Data/AdminMenuData.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd"> | ||
| <entity name="AdminMenuReports"> | ||
| <data key="pageTitle">Reports</data> | ||
| <data key="title">Reports</data> | ||
| <data key="dataUiId">magento-reports-report</data> | ||
| </entity> | ||
| <entity name="AdminMenuReportsBusinessIntelligenceAdvancedReporting"> | ||
| <data key="pageTitle">AdvancedReporting</data> | ||
| <data key="title">AdvancedReporting</data> | ||
| <data key="dataUiId">magento-analytics-advanced-reporting</data> | ||
| </entity> | ||
| </entities> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingNavigateMenuTest.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> | ||
| <test name="AdminAdvancedReportingNavigateMenuTest"> | ||
| <annotations> | ||
| <features value="Analytics"/> | ||
| <stories value="Menu Navigation"/> | ||
| <title value="Admin advanced reporting navigate menu test"/> | ||
| <description value="Admin should be able to navigate through advanced reporting admin menu to BI reports page"/> | ||
| <severity value="CRITICAL"/> | ||
| <testCaseId value="MC-14152"/> | ||
| <group value="menu"/> | ||
| <group value="mtf_migrated"/> | ||
| </annotations> | ||
| <before> | ||
| <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/> | ||
| </before> | ||
| <after> | ||
| <actionGroup ref="logout" stepKey="logout"/> | ||
| </after> | ||
| <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateAdvancedReportingPage"> | ||
| <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/> | ||
| <argument name="submenuUiId" value="{{AdminMenuReportsBusinessIntelligenceAdvancedReporting.dataUiId}}"/> | ||
| </actionGroup> | ||
| <switchToNextTab stepKey="switchToNewTab"/> | ||
| <seeInCurrentUrl url="advancedreporting.rjmetrics.com/report" stepKey="seeAssertAdvancedReportingPageUrl"/> | ||
| </test> | ||
| </tests> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminAssertPageTitleActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="AdminAssertPageTitleActionGroup"> | ||
| <arguments> | ||
| <argument name="title" type="string"/> | ||
| </arguments> | ||
| <see selector="{{AdminGridHeaders.title}}" userInput="{{title}}" stepKey="assertPageTitle"/> | ||
| </actionGroup> | ||
| </actionGroups> |
19 changes: 19 additions & 0 deletions
19
app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateMenuActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="AdminNavigateMenuActionGroup"> | ||
| <arguments> | ||
| <argument name="menuUiId" type="string"/> | ||
| <argument name="submenuUiId" type="string"/> | ||
| </arguments> | ||
| <click selector="{{AdminMenuSection.menuItem(menuUiId)}}" stepKey="clickOnMenuItem"/> | ||
| <click selector="{{AdminMenuSection.menuItem(submenuUiId)}}" stepKey="clickOnSubmenuItem"/> | ||
| </actionGroup> | ||
| </actionGroups> |
14 changes: 14 additions & 0 deletions
14
app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminSuccessLoginActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="AssertAdminSuccessLoginActionGroup"> | ||
| <waitForElementVisible selector="{{AdminHeaderSection.adminUserAccountText}}" stepKey="waitForAdminAccountTextVisible" /> | ||
| </actionGroup> | ||
| </actionGroups> |
18 changes: 18 additions & 0 deletions
18
app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertMessageOnAdminLoginActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="AssertMessageOnAdminLoginActionGroup"> | ||
| <arguments> | ||
| <argument name="message" type="string" defaultValue="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later." /> | ||
| <argument name="messageType" type="string" defaultValue="error" /> | ||
| </arguments> | ||
| <see userInput="{{message}}" selector="{{AdminLoginMessagesSection.messageByType(messageType)}}" stepKey="verifyMessage" /> | ||
| </actionGroup> | ||
| </actionGroups> |
22 changes: 22 additions & 0 deletions
22
app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAdminWithCredentialsActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="LoginAdminWithCredentialsActionGroup"> | ||
| <arguments> | ||
| <argument name="adminUser" type="string" /> | ||
| <argument name="adminPassword" type="string" /> | ||
| </arguments> | ||
| <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}" stepKey="navigateToAdmin"/> | ||
| <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{adminUser}}" stepKey="fillUsername"/> | ||
| <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{adminPassword}}" stepKey="fillPassword"/> | ||
| <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/> | ||
| <closeAdminNotification stepKey="closeAdminNotification"/> | ||
| </actionGroup> | ||
| </actionGroups> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
...de/Magento/Backend/Test/Mftf/ActionGroup/SetWebsiteCountryOptionsToDefaultActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="SetWebsiteCountryOptionsToDefaultActionGroup"> | ||
| <conditionalClick selector="{{CountryOptionsSection.countryOptions}}" dependentSelector="{{CountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="clickOnStoreInformation3"/> | ||
| <waitForElementVisible selector="{{CountryOptionsSection.topDestinations}}" stepKey="waitCheckboxToBeVisible3"/> | ||
| <checkOption selector="{{CountryOptionsSection.generalCountryAllowInherit}}" stepKey="setToDefault1"/> | ||
| <checkOption selector="{{CountryOptionsSection.generalCountryDefaultInherit}}" stepKey="setToDefault2"/> | ||
| <click selector="{{ContentManagementSection.Save}}" stepKey="saveDefaultConfig"/> | ||
| <waitForPageLoad stepKey="waitForSavingSystemConfiguration"/> | ||
| <see userInput="You saved the configuration." stepKey="seeSuccessMessage"/> | ||
| </actionGroup> | ||
| </actionGroups> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd"> | ||
| <entity name="AdminMenuContent"> | ||
| <data key="pageTitle">Content</data> | ||
| <data key="title">Content</data> | ||
| <data key="dataUiId">magento-backend-content</data> | ||
| </entity> | ||
| <entity name="AdminMenuContentDesignSchedule"> | ||
| <data key="pageTitle">Store Design Schedule</data> | ||
| <data key="title">Schedule</data> | ||
| <data key="dataUiId">magento-backend-system-design-schedule</data> | ||
| </entity> | ||
| <entity name="AdminMenuDashboard"> | ||
| <data key="pageTitle">Dashboard</data> | ||
| <data key="title">Dashboard</data> | ||
| <data key="dataUiId">magento-backend-dashboard</data> | ||
| </entity> | ||
| <entity name="AdminMenuStores"> | ||
| <data key="pageTitle">Stores</data> | ||
| <data key="title">Stores</data> | ||
| <data key="dataUiId">magento-backend-stores</data> | ||
| </entity> | ||
| <entity name="AdminMenuStoresSettingsAllStores"> | ||
| <data key="pageTitle">Stores</data> | ||
| <data key="title">All Stores</data> | ||
| <data key="dataUiId">magento-backend-system-store</data> | ||
| </entity> | ||
| <entity name="AdminMenuStoresSettingsConfiguration"> | ||
| <data key="pageTitle">Configuration</data> | ||
| <data key="title">Configuration</data> | ||
| <data key="dataUiId">magento-config-system-config</data> | ||
| </entity> | ||
| <entity name="AdminMenuSystemToolsCacheManagement"> | ||
| <data key="pageTitle">Cache Management</data> | ||
| <data key="title">Cache Management</data> | ||
| <data key="dataUiId">magento-backend-system-cache</data> | ||
| </entity> | ||
| </entities> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
app/code/Magento/Backend/Test/Mftf/Section/AdminLoginMessagesSection.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd"> | ||
| <section name="AdminLoginMessagesSection"> | ||
| <element name="messageByType" type="block" selector=".login-content .messages .message-{{messageType}}" parameterized="true" /> | ||
| </section> | ||
| </sections> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.