Skip to content

Commit 32ed03c

Browse files
zakdmazakdma
authored
Merge pull request #6242 from magento-tsg/2.4-develop-sidecar-pr4
[Sidecar] Fixes for 2.4 (pr4)
2 parents c0f3dfb + bfc1033 commit 32ed03c

24 files changed

+1433
-81
lines changed

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCheckPresentSubCategoryActionGroup.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="StorefrontCheckPresentSubCategoryActionGroup">
11+
<annotations>
12+
<description>Checks for a subcategory in topmenu</description>
13+
</annotations>
14+
<arguments>
15+
<argument name="parenCategoryName" type="string"/>
16+
<argument name="childCategoryName" type="string"/>
17+
</arguments>
18+
19+
<waitForElementVisible selector="{{StorefrontHeaderSection.NavigationCategoryByName(parenCategoryName)}}" stepKey="waitForTopMenuLoaded"/>
20+
<moveMouseOver selector="{{StorefrontHeaderSection.NavigationCategoryByName(parenCategoryName)}}" stepKey="moveMouseToParentCategory"/>
21+
<seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(childCategoryName)}}" stepKey="seeSubcategoryInTree"/>
22+
</actionGroup>
23+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryEditPage.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
<section name="AdminCategoryModalSection"/>
2020
<section name="AdminCategoryMessagesSection"/>
2121
<section name="AdminCategoryContentSection"/>
22+
<section name="AdminCategoryScheduleDesignUpdateSection"/>
2223
</page>
2324
</pages>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection/AdminCategoryBasicFieldSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,6 @@
2222
<element name="FieldError" type="text" selector=".admin__field-error[data-bind='attr: {for: {{field}}}, text: error']" parameterized="true"/>
2323
<element name="panelFieldControl" type="input" selector="//aside//div[@data-index=&quot;{{arg1}}&quot;]/descendant::*[@name=&quot;{{arg2}}&quot;]" parameterized="true"/>
2424
<element name="productsInCategory" type="input" selector="div[data-index='assign_products']" timeout="30"/>
25+
<element name="scheduleDesignUpdateTab" type="block" selector="div[data-index='schedule_design_update']" timeout="15"/>
2526
</section>
2627
</sections>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryScheduleDesignUpdateSection.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
10+
<section name="AdminCategoryScheduleDesignUpdateSection">
11+
<element name="sectionHeader" type="button" selector="div[data-index='schedule_design_update'] .fieldset-wrapper-title" timeout="30"/>
12+
<element name="sectionBody" type="text" selector="div[data-index='schedule_design_update'] .admin__fieldset-wrapper-content"/>
13+
</section>
14+
</sections>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCategoryIndexerInUpdateOnScheduleModeTest.xml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,15 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="AdminProductCategoryIndexerInUpdateOnScheduleModeTest">
1212
<annotations>
13+
<features value="Catalog"/>
1314
<stories value="Product Categories Indexer"/>
1415
<title value="Product Categories Indexer in Update on Schedule mode"/>
1516
<description value="The test verifies that in Update on Schedule mode if displaying of category products on Storefront changes due to product properties change,
1617
the changes are NOT applied immediately, but applied only after cron runs (twice)."/>
17-
<severity value="BLOCKER"/>
18-
<testCaseId value="MC-11146"/>
18+
<severity value="CRITICAL"/>
19+
<testCaseId value="MC-26119"/>
1920
<group value="catalog"/>
2021
<group value="indexer"/>
21-
<skip>
22-
<issueId value="MC-20392"/>
23-
</skip>
2422
</annotations>
2523
<before>
2624
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

‎app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSaveAndContinueWidgetActionGroup.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<!--
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
-->
7+
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminSaveAndContinueWidgetActionGroup">
11+
<annotations>
12+
<description>Click on the Save an Continue button and check the success message</description>
13+
</annotations>
14+
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
15+
<click selector="{{AdminNewWidgetSection.saveAndContinue}}" stepKey="clickSaveWidget"/>
16+
<waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessageAppeared"/>
17+
<see selector="{{AdminMessagesSection.success}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetWidgetNameAndStoreActionGroup.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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="AdminSetWidgetNameAndStoreActionGroup">
12+
<annotations>
13+
<description>Set widget name, store IDs and sort order on Widget edit page</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="widgetTitle" defaultValue="{{ProductsListWidget.name}}" type="string"/>
17+
<argument name="widgetStoreIds" defaultValue="{{ProductsListWidget.store_ids}}" type="string"/>
18+
<argument name="widgetSortOrder" defaultValue="{{ProductsListWidget.sort_order}}" type="string"/>
19+
</arguments>
20+
<waitForElementVisible selector="{{AdminNewWidgetSection.widgetTitle}}" stepKey="waitForWidgetTitleInputVisible"/>
21+
<fillField selector="{{AdminNewWidgetSection.widgetTitle}}" userInput="{{widgetTitle}}" stepKey="fillTitle"/>
22+
<selectOption selector="{{AdminNewWidgetSection.widgetStoreIds}}" parameterArray="{{widgetStoreIds}}" stepKey="setWidgetStoreId"/>
23+
<fillField selector="{{AdminNewWidgetSection.widgetSortOrder}}" userInput="{{widgetSortOrder}}" stepKey="fillSortOrder"/>
24+
</actionGroup>
25+
</actionGroups>

‎app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetWidgetTypeAndDesignActionGroup.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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="AdminSetWidgetTypeAndDesignActionGroup">
12+
<annotations>
13+
<description>Select type and design on Widget edit page</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="widgetType" defaultValue="{{ProductsListWidget.type}}" type="string"/>
17+
<argument name="widgetDesign" defaultValue="{{ProductsListWidget.design_theme}}" type="string"/>
18+
</arguments>
19+
<waitForElementVisible selector="{{AdminNewWidgetSection.widgetType}}" stepKey="waitForTypeInputVisible"/>
20+
<selectOption selector="{{AdminNewWidgetSection.widgetType}}" userInput="{{widgetType}}" stepKey="setWidgetType"/>
21+
<selectOption selector="{{AdminNewWidgetSection.widgetDesignTheme}}" userInput="{{widgetDesign}}" stepKey="setWidgetDesignTheme"/>
22+
</actionGroup>
23+
</actionGroups>

‎app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<data key="type">Catalog Products List</data>
1313
<data key="design_theme">Magento Luma</data>
1414
<data key="name" unique="suffix">TestWidget</data>
15+
<data key="sort_order">0</data>
1516
<array key="store_ids">
1617
<item>All Store Views</item>
1718
</array>

‎app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<element name="widgetType" type="select" selector="#code"/>
1313
<element name="widgetDesignTheme" type="select" selector="#theme_id"/>
1414
<element name="continue" type="button" timeout="30" selector="#continue_button"/>
15+
<element name="resetBtn" type="button" selector=".page-actions-buttons button#reset" timeout="30"/>
1516
<element name="widgetTitle" type="input" selector="#title"/>
1617
<element name="widgetStoreIds" type="select" selector="#store_ids"/>
1718
<element name="widgetSortOrder" type="input" selector="#sort_order"/>
@@ -38,14 +39,16 @@
3839
<element name="searchBlock" type="button" selector="//div[@class='admin__filter-actions']/button[@title='Search']"/>
3940
<element name="blockStatus" type="select" selector="//select[@name='chooser_is_active']"/>
4041
<element name="searchedBlock" type="button" selector="//*[@class='magento-message']//tbody/tr/td[1]"/>
41-
<element name="saveWidget" type="select" selector="#save"/>
42+
<element name="saveWidget" type="button" selector="#save" timeout="30"/>
4243
<element name="displayMode" type="select" selector="select[id*='display_mode']"/>
4344
<element name="restrictTypes" type="select" selector="select[id*='types']"/>
4445
<element name="saveAndContinue" type="button" selector="#save_and_edit_button" timeout="30"/>
46+
<element name="widgetInstanceType" type="select" selector=".admin__field-control select#instance_code" />
4547
<!-- Catalog Product List Widget Options -->
4648
<element name="title" type="input" selector="[name='parameters[title]']"/>
4749
<element name="displayPageControl" type="select" selector="[name='parameters[show_pager]']"/>
4850
<element name="numberOfProductsToDisplay" type="input" selector="[name='parameters[products_count]']"/>
4951
<element name="cacheLifetime" type="input" selector="[name='parameters[cache_lifetime]']"/>
5052
</section>
5153
</sections>
54+

‎app/code/Magento/Widget/Test/Mftf/Test/AdminResetWidgetTest.xml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminResetWidgetTest">
12+
<annotations>
13+
<features value="Widget"/>
14+
<stories value="CMS Widgets"/>
15+
<title value="Reset Widget"/>
16+
<description value="Check that admin user can reset widget form after filling out all information"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="MC-37892"/>
19+
<group value="widget"/>
20+
</annotations>
21+
<before>
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
23+
</before>
24+
<after>
25+
<actionGroup ref="AdminDeleteWidgetActionGroup" stepKey="deleteWidget">
26+
<argument name="widget" value="ProductsListWidget"/>
27+
</actionGroup>
28+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
29+
</after>
30+
<amOnPage url="{{AdminNewWidgetPage.url}}" stepKey="amOnAdminNewWidgetPage"/>
31+
<actionGroup ref="AdminSetWidgetTypeAndDesignActionGroup" stepKey="firstSetTypeAndDesign">
32+
<argument name="widgetType" value="{{ProductsListWidget.type}}"/>
33+
<argument name="widgetDesign" value="{{ProductsListWidget.design_theme}}"/>
34+
</actionGroup>
35+
<click selector="{{AdminNewWidgetSection.resetBtn}}" stepKey="resetInstance"/>
36+
<dontSeeInField userInput="{{ProductsListWidget.type}}" selector="{{AdminNewWidgetSection.widgetType}}" stepKey="dontSeeTypeAfterReset"/>
37+
<dontSeeInField userInput="{{ProductsListWidget.design_theme}}" selector="{{AdminNewWidgetSection.widgetDesignTheme}}" stepKey="dontSeeDesignAfterReset"/>
38+
<actionGroup ref="AdminSetWidgetTypeAndDesignActionGroup" stepKey="setTypeAndDesignAfterReset">
39+
<argument name="widgetType" value="{{ProductsListWidget.type}}"/>
40+
<argument name="widgetDesign" value="{{ProductsListWidget.design_theme}}"/>
41+
</actionGroup>
42+
<click selector="{{AdminNewWidgetSection.continue}}" stepKey="clickContinue"/>
43+
<actionGroup ref="AdminSetWidgetNameAndStoreActionGroup" stepKey="setNameAndStore">
44+
<argument name="widgetTitle" value="{{ProductsListWidget.name}}"/>
45+
<argument name="widgetStoreIds" value="{{ProductsListWidget.store_ids}}"/>
46+
<argument name="widgetSortOrder" value="{{ProductsListWidget.sort_order}}"/>
47+
</actionGroup>
48+
<click selector="{{AdminNewWidgetSection.resetBtn}}" stepKey="resetNameAndStore"/>
49+
<dontSeeInField userInput="{{ProductsListWidget.name}}" selector="{{AdminNewWidgetSection.widgetTitle}}" stepKey="dontSeeNameAfterReset"/>
50+
<dontSeeInField userInput="{{ProductsListWidget.store_ids[0]}}" selector="{{AdminNewWidgetSection.widgetStoreIds}}" stepKey="dontSeeStoreAfterReset"/>
51+
<dontSeeInField userInput="{{ProductsListWidget.sort_order}}" selector="{{AdminNewWidgetSection.widgetSortOrder}}" stepKey="dontSeeSortOrderAfterReset"/>
52+
<actionGroup ref="AdminSetWidgetNameAndStoreActionGroup" stepKey="setNameAndStoreAfterReset">
53+
<argument name="widgetTitle" value="{{ProductsListWidget.name}}"/>
54+
<argument name="widgetStoreIds" value="{{ProductsListWidget.store_ids}}"/>
55+
<argument name="widgetSortOrder" value="{{ProductsListWidget.sort_order}}"/>
56+
</actionGroup>
57+
<actionGroup ref="AdminSaveAndContinueWidgetActionGroup" stepKey="saveWidgetAndContinue"/>
58+
<click selector="{{AdminNewWidgetSection.resetBtn}}" stepKey="resetWidgetForm"/>
59+
<seeInField userInput="{{ProductsListWidget.name}}" selector="{{AdminNewWidgetSection.widgetTitle}}" stepKey="seeNameAfterReset"/>
60+
<seeInField userInput="{{ProductsListWidget.store_ids[0]}}" selector="{{AdminNewWidgetSection.widgetStoreIds}}" stepKey="seeStoreAfterReset"/>
61+
<seeInField userInput="{{ProductsListWidget.sort_order}}" selector="{{AdminNewWidgetSection.widgetSortOrder}}" stepKey="seeSortOrderAfterReset"/>
62+
<seeInField userInput="{{ProductsListWidget.type}}" selector="{{AdminNewWidgetSection.widgetInstanceType}}" stepKey="seeTypeAfterReset"/>
63+
<seeInField userInput="{{ProductsListWidget.design_theme}}" selector="{{AdminNewWidgetSection.widgetDesignTheme}}" stepKey="seeThemeAfterReset"/>
64+
</test>
65+
</tests>

0 commit comments

Comments
 (0)