-
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.
Merge pull request #6242 from magento-tsg/2.4-develop-sidecar-pr4
[Sidecar] Fixes for 2.4 (pr4)
- Loading branch information
Showing
24 changed files
with
1,433 additions
and
81 deletions.
There are no files selected for viewing
23 changes: 23 additions & 0 deletions
23
...de/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCheckPresentSubCategoryActionGroup.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,23 @@ | ||
| <?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="StorefrontCheckPresentSubCategoryActionGroup"> | ||
| <annotations> | ||
| <description>Checks for a subcategory in topmenu</description> | ||
| </annotations> | ||
| <arguments> | ||
| <argument name="parenCategoryName" type="string"/> | ||
| <argument name="childCategoryName" type="string"/> | ||
| </arguments> | ||
|
|
||
| <waitForElementVisible selector="{{StorefrontHeaderSection.NavigationCategoryByName(parenCategoryName)}}" stepKey="waitForTopMenuLoaded"/> | ||
| <moveMouseOver selector="{{StorefrontHeaderSection.NavigationCategoryByName(parenCategoryName)}}" stepKey="moveMouseToParentCategory"/> | ||
| <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(childCategoryName)}}" stepKey="seeSubcategoryInTree"/> | ||
| </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
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/Catalog/Test/Mftf/Section/AdminCategoryScheduleDesignUpdateSection.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="AdminCategoryScheduleDesignUpdateSection"> | ||
| <element name="sectionHeader" type="button" selector="div[data-index='schedule_design_update'] .fieldset-wrapper-title" timeout="30"/> | ||
| <element name="sectionBody" type="text" selector="div[data-index='schedule_design_update'] .admin__fieldset-wrapper-content"/> | ||
| </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
19 changes: 19 additions & 0 deletions
19
app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSaveAndContinueWidgetActionGroup.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 @@ | ||
| <!-- | ||
| /** | ||
| * 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="AdminSaveAndContinueWidgetActionGroup"> | ||
| <annotations> | ||
| <description>Click on the Save an Continue button and check the success message</description> | ||
| </annotations> | ||
| <scrollToTopOfPage stepKey="scrollToTopOfPage"/> | ||
| <click selector="{{AdminNewWidgetSection.saveAndContinue}}" stepKey="clickSaveWidget"/> | ||
| <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessageAppeared"/> | ||
| <see selector="{{AdminMessagesSection.success}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/> | ||
| </actionGroup> | ||
| </actionGroups> |
25 changes: 25 additions & 0 deletions
25
app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetWidgetNameAndStoreActionGroup.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,25 @@ | ||
| <?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="AdminSetWidgetNameAndStoreActionGroup"> | ||
| <annotations> | ||
| <description>Set widget name, store IDs and sort order on Widget edit page</description> | ||
| </annotations> | ||
| <arguments> | ||
| <argument name="widgetTitle" defaultValue="{{ProductsListWidget.name}}" type="string"/> | ||
| <argument name="widgetStoreIds" defaultValue="{{ProductsListWidget.store_ids}}" type="string"/> | ||
| <argument name="widgetSortOrder" defaultValue="{{ProductsListWidget.sort_order}}" type="string"/> | ||
| </arguments> | ||
| <waitForElementVisible selector="{{AdminNewWidgetSection.widgetTitle}}" stepKey="waitForWidgetTitleInputVisible"/> | ||
| <fillField selector="{{AdminNewWidgetSection.widgetTitle}}" userInput="{{widgetTitle}}" stepKey="fillTitle"/> | ||
| <selectOption selector="{{AdminNewWidgetSection.widgetStoreIds}}" parameterArray="{{widgetStoreIds}}" stepKey="setWidgetStoreId"/> | ||
| <fillField selector="{{AdminNewWidgetSection.widgetSortOrder}}" userInput="{{widgetSortOrder}}" stepKey="fillSortOrder"/> | ||
| </actionGroup> | ||
| </actionGroups> |
23 changes: 23 additions & 0 deletions
23
app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetWidgetTypeAndDesignActionGroup.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,23 @@ | ||
| <?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="AdminSetWidgetTypeAndDesignActionGroup"> | ||
| <annotations> | ||
| <description>Select type and design on Widget edit page</description> | ||
| </annotations> | ||
| <arguments> | ||
| <argument name="widgetType" defaultValue="{{ProductsListWidget.type}}" type="string"/> | ||
| <argument name="widgetDesign" defaultValue="{{ProductsListWidget.design_theme}}" type="string"/> | ||
| </arguments> | ||
| <waitForElementVisible selector="{{AdminNewWidgetSection.widgetType}}" stepKey="waitForTypeInputVisible"/> | ||
| <selectOption selector="{{AdminNewWidgetSection.widgetType}}" userInput="{{widgetType}}" stepKey="setWidgetType"/> | ||
| <selectOption selector="{{AdminNewWidgetSection.widgetDesignTheme}}" userInput="{{widgetDesign}}" stepKey="setWidgetDesignTheme"/> | ||
| </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
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
65 changes: 65 additions & 0 deletions
65
app/code/Magento/Widget/Test/Mftf/Test/AdminResetWidgetTest.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,65 @@ | ||
| <?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="AdminResetWidgetTest"> | ||
| <annotations> | ||
| <features value="Widget"/> | ||
| <stories value="CMS Widgets"/> | ||
| <title value="Reset Widget"/> | ||
| <description value="Check that admin user can reset widget form after filling out all information"/> | ||
| <severity value="MAJOR"/> | ||
| <testCaseId value="MC-37892"/> | ||
| <group value="widget"/> | ||
| </annotations> | ||
| <before> | ||
| <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/> | ||
| </before> | ||
| <after> | ||
| <actionGroup ref="AdminDeleteWidgetActionGroup" stepKey="deleteWidget"> | ||
| <argument name="widget" value="ProductsListWidget"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/> | ||
| </after> | ||
| <amOnPage url="{{AdminNewWidgetPage.url}}" stepKey="amOnAdminNewWidgetPage"/> | ||
| <actionGroup ref="AdminSetWidgetTypeAndDesignActionGroup" stepKey="firstSetTypeAndDesign"> | ||
| <argument name="widgetType" value="{{ProductsListWidget.type}}"/> | ||
| <argument name="widgetDesign" value="{{ProductsListWidget.design_theme}}"/> | ||
| </actionGroup> | ||
| <click selector="{{AdminNewWidgetSection.resetBtn}}" stepKey="resetInstance"/> | ||
| <dontSeeInField userInput="{{ProductsListWidget.type}}" selector="{{AdminNewWidgetSection.widgetType}}" stepKey="dontSeeTypeAfterReset"/> | ||
| <dontSeeInField userInput="{{ProductsListWidget.design_theme}}" selector="{{AdminNewWidgetSection.widgetDesignTheme}}" stepKey="dontSeeDesignAfterReset"/> | ||
| <actionGroup ref="AdminSetWidgetTypeAndDesignActionGroup" stepKey="setTypeAndDesignAfterReset"> | ||
| <argument name="widgetType" value="{{ProductsListWidget.type}}"/> | ||
| <argument name="widgetDesign" value="{{ProductsListWidget.design_theme}}"/> | ||
| </actionGroup> | ||
| <click selector="{{AdminNewWidgetSection.continue}}" stepKey="clickContinue"/> | ||
| <actionGroup ref="AdminSetWidgetNameAndStoreActionGroup" stepKey="setNameAndStore"> | ||
| <argument name="widgetTitle" value="{{ProductsListWidget.name}}"/> | ||
| <argument name="widgetStoreIds" value="{{ProductsListWidget.store_ids}}"/> | ||
| <argument name="widgetSortOrder" value="{{ProductsListWidget.sort_order}}"/> | ||
| </actionGroup> | ||
| <click selector="{{AdminNewWidgetSection.resetBtn}}" stepKey="resetNameAndStore"/> | ||
| <dontSeeInField userInput="{{ProductsListWidget.name}}" selector="{{AdminNewWidgetSection.widgetTitle}}" stepKey="dontSeeNameAfterReset"/> | ||
| <dontSeeInField userInput="{{ProductsListWidget.store_ids[0]}}" selector="{{AdminNewWidgetSection.widgetStoreIds}}" stepKey="dontSeeStoreAfterReset"/> | ||
| <dontSeeInField userInput="{{ProductsListWidget.sort_order}}" selector="{{AdminNewWidgetSection.widgetSortOrder}}" stepKey="dontSeeSortOrderAfterReset"/> | ||
| <actionGroup ref="AdminSetWidgetNameAndStoreActionGroup" stepKey="setNameAndStoreAfterReset"> | ||
| <argument name="widgetTitle" value="{{ProductsListWidget.name}}"/> | ||
| <argument name="widgetStoreIds" value="{{ProductsListWidget.store_ids}}"/> | ||
| <argument name="widgetSortOrder" value="{{ProductsListWidget.sort_order}}"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminSaveAndContinueWidgetActionGroup" stepKey="saveWidgetAndContinue"/> | ||
| <click selector="{{AdminNewWidgetSection.resetBtn}}" stepKey="resetWidgetForm"/> | ||
| <seeInField userInput="{{ProductsListWidget.name}}" selector="{{AdminNewWidgetSection.widgetTitle}}" stepKey="seeNameAfterReset"/> | ||
| <seeInField userInput="{{ProductsListWidget.store_ids[0]}}" selector="{{AdminNewWidgetSection.widgetStoreIds}}" stepKey="seeStoreAfterReset"/> | ||
| <seeInField userInput="{{ProductsListWidget.sort_order}}" selector="{{AdminNewWidgetSection.widgetSortOrder}}" stepKey="seeSortOrderAfterReset"/> | ||
| <seeInField userInput="{{ProductsListWidget.type}}" selector="{{AdminNewWidgetSection.widgetInstanceType}}" stepKey="seeTypeAfterReset"/> | ||
| <seeInField userInput="{{ProductsListWidget.design_theme}}" selector="{{AdminNewWidgetSection.widgetDesignTheme}}" stepKey="seeThemeAfterReset"/> | ||
| </test> | ||
| </tests> |
Oops, something went wrong.