Skip to content

Commit 64978b4

Browse files
dimonovpdimonovp
committed
MC-37896: Create automated test for "Reset Widget"
1 parent 19da476 commit 64978b4

File tree

5 files changed

+20
-18
lines changed

5 files changed

+20
-18
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</annotations>
1414
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
1515
<click selector="{{AdminNewWidgetSection.saveAndContinue}}" stepKey="clickSaveWidget"/>
16-
<waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForPageLoad"/>
16+
<waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessageAppeared"/>
1717
<see selector="{{AdminMessagesSection.success}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
1818
</actionGroup>
1919
</actionGroups>

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AdminSetWidgetNameAndStoreActionGroup">
1212
<annotations>
13-
<description>On the widget creation page page set widget name, store add sort order.</description>
13+
<description>Set widget name, store IDs and sort order on Widget edit page</description>
1414
</annotations>
1515
<arguments>
16-
<argument name="widgetName" defaultValue="{{ProductsListWidget.name}}" type="string"/>
16+
<argument name="widgetTitle" defaultValue="{{ProductsListWidget.name}}" type="string"/>
1717
<argument name="widgetStoreIds" defaultValue="{{ProductsListWidget.store_ids}}" type="string"/>
1818
<argument name="widgetSortOrder" defaultValue="{{ProductsListWidget.sort_order}}" type="string"/>
1919
</arguments>
20-
<fillField selector="{{AdminNewWidgetSection.widgetTitle}}" userInput="{{widgetName}}" stepKey="fillTitle"/>
20+
<waitForElementVisible selector="{{AdminNewWidgetSection.widgetTitle}}" stepKey="waitForWidgetTitleInputVisible"/>
21+
<fillField selector="{{AdminNewWidgetSection.widgetTitle}}" userInput="{{widgetTitle}}" stepKey="fillTitle"/>
2122
<selectOption selector="{{AdminNewWidgetSection.widgetStoreIds}}" parameterArray="{{widgetStoreIds}}" stepKey="setWidgetStoreId"/>
2223
<fillField selector="{{AdminNewWidgetSection.widgetSortOrder}}" userInput="{{widgetSortOrder}}" stepKey="fillSortOrder"/>
2324
</actionGroup>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
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="AdminSetInputTypeAndDesignActionGroup">
11+
<actionGroup name="AdminSetWidgetTypeAndDesignActionGroup">
1212
<annotations>
13-
<description>On the widget_instance page select widget type and design</description>
13+
<description>Select type and design on Widget edit page</description>
1414
</annotations>
1515
<arguments>
1616
<argument name="widgetType" defaultValue="{{ProductsListWidget.type}}" type="string"/>
1717
<argument name="widgetDesign" defaultValue="{{ProductsListWidget.design_theme}}" type="string"/>
1818
</arguments>
19+
<waitForElementVisible selector="{{AdminNewWidgetSection.widgetType}}" stepKey="waitForTypeInputVisible"/>
1920
<selectOption selector="{{AdminNewWidgetSection.widgetType}}" userInput="{{widgetType}}" stepKey="setWidgetType"/>
2021
<selectOption selector="{{AdminNewWidgetSection.widgetDesignTheme}}" userInput="{{widgetDesign}}" stepKey="setWidgetDesignTheme"/>
2122
</actionGroup>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +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="#reset" timeout="30"/>
15+
<element name="resetBtn" type="button" selector="//*[@class='page-actions-buttons']/button[@id='reset']" timeout="30"/>
1616
<element name="widgetTitle" type="input" selector="#title"/>
1717
<element name="widgetStoreIds" type="select" selector="#store_ids"/>
1818
<element name="widgetSortOrder" type="input" selector="#sort_order"/>
@@ -39,11 +39,11 @@
3939
<element name="searchBlock" type="button" selector="//div[@class='admin__filter-actions']/button[@title='Search']"/>
4040
<element name="blockStatus" type="select" selector="//select[@name='chooser_is_active']"/>
4141
<element name="searchedBlock" type="button" selector="//*[@class='magento-message']//tbody/tr/td[1]"/>
42-
<element name="saveWidget" type="button" selector="#save"/>
42+
<element name="saveWidget" type="button" selector="#save" timeout="30"/>
4343
<element name="displayMode" type="select" selector="select[id*='display_mode']"/>
4444
<element name="restrictTypes" type="select" selector="select[id*='types']"/>
4545
<element name="saveAndContinue" type="button" selector="#save_and_edit_button" timeout="30"/>
46-
<element name="widgetInstanceType" type="select" selector="#instance_code" />
46+
<element name="widgetInstanceType" type="select" selector="//*[@class='admin__field-control control']/select[@id='instance_code']" />
4747
<!-- Catalog Product List Widget Options -->
4848
<element name="title" type="input" selector="[name='parameters[title]']"/>
4949
<element name="displayPageControl" type="select" selector="[name='parameters[show_pager]']"/>

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<test name="AdminResetWidgetTest">
1212
<annotations>
1313
<features value="Widget"/>
14-
<stories value="Reset widget"/>
15-
<title value="[CMS Widgets] Reset Widget"/>
14+
<stories value="CMS Widgets"/>
15+
<title value="Reset Widget"/>
1616
<description value="Check that admin user can reset widget form after filling out all information"/>
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MC-37892"/>
@@ -23,25 +23,25 @@
2323
</before>
2424
<after>
2525
<actionGroup ref="AdminDeleteWidgetActionGroup" stepKey="deleteWidget">
26-
<argument name="widget" value="ProductsListWidget"/>
26+
<argument name="widget" value="{{ProductsListWidget}}"/>
2727
</actionGroup>
2828
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
2929
</after>
3030
<amOnPage url="{{AdminNewWidgetPage.url}}" stepKey="amOnAdminNewWidgetPage"/>
31-
<actionGroup ref="AdminSetInputTypeAndDesignActionGroup" stepKey="firstSetTypeAndDesign">
31+
<actionGroup ref="AdminSetWidgetTypeAndDesignActionGroup" stepKey="firstSetTypeAndDesign">
3232
<argument name="widgetType" value="{{ProductsListWidget.type}}"/>
3333
<argument name="widgetDesign" value="{{ProductsListWidget.design_theme}}"/>
3434
</actionGroup>
3535
<click selector="{{AdminNewWidgetSection.resetBtn}}" stepKey="resetInstance"/>
3636
<dontSeeInField userInput="{{ProductsListWidget.type}}" selector="{{AdminNewWidgetSection.widgetType}}" stepKey="dontSeeTypeAfterReset"/>
3737
<dontSeeInField userInput="{{ProductsListWidget.design_theme}}" selector="{{AdminNewWidgetSection.widgetDesignTheme}}" stepKey="dontSeeDesignAfterReset"/>
38-
<actionGroup ref="AdminSetInputTypeAndDesignActionGroup" stepKey="setTypeAndDesignAfterReset">
38+
<actionGroup ref="AdminSetWidgetTypeAndDesignActionGroup" stepKey="setTypeAndDesignAfterReset">
3939
<argument name="widgetType" value="{{ProductsListWidget.type}}"/>
4040
<argument name="widgetDesign" value="{{ProductsListWidget.design_theme}}"/>
4141
</actionGroup>
4242
<click selector="{{AdminNewWidgetSection.continue}}" stepKey="clickContinue"/>
4343
<actionGroup ref="AdminSetWidgetNameAndStoreActionGroup" stepKey="setNameAndStore">
44-
<argument name="widgetName" value="{{ProductsListWidget.name}}"/>
44+
<argument name="widgetTitle" value="{{ProductsListWidget.name}}"/>
4545
<argument name="widgetStoreIds" value="{{ProductsListWidget.store_ids}}"/>
4646
<argument name="widgetSortOrder" value="{{ProductsListWidget.sort_order}}"/>
4747
</actionGroup>
@@ -50,12 +50,12 @@
5050
<dontSeeInField userInput="{{ProductsListWidget.store_ids[0]}}" selector="{{AdminNewWidgetSection.widgetStoreIds}}" stepKey="dontSeeStoreAfterReset"/>
5151
<dontSeeInField userInput="{{ProductsListWidget.sort_order}}" selector="{{AdminNewWidgetSection.widgetSortOrder}}" stepKey="dontSeeSortOrderAfterReset"/>
5252
<actionGroup ref="AdminSetWidgetNameAndStoreActionGroup" stepKey="setNameAndStoreAfterReset">
53-
<argument name="widgetName" value="{{ProductsListWidget.name}}"/>
53+
<argument name="widgetTitle" value="{{ProductsListWidget.name}}"/>
5454
<argument name="widgetStoreIds" value="{{ProductsListWidget.store_ids}}"/>
5555
<argument name="widgetSortOrder" value="{{ProductsListWidget.sort_order}}"/>
5656
</actionGroup>
57-
<actionGroup ref="AdminSaveAndContinueWidgetActionGroup" stepKey="saveWidget"/>
58-
<click selector="{{AdminNewWidgetSection.resetBtn}}" stepKey="resetWidget"/>
57+
<actionGroup ref="AdminSaveAndContinueWidgetActionGroup" stepKey="saveWidgetAndContinue"/>
58+
<click selector="{{AdminNewWidgetSection.resetBtn}}" stepKey="resetWidgetForm"/>
5959
<seeInField userInput="{{ProductsListWidget.name}}" selector="{{AdminNewWidgetSection.widgetTitle}}" stepKey="seeNameAfterReset"/>
6060
<seeInField userInput="{{ProductsListWidget.store_ids[0]}}" selector="{{AdminNewWidgetSection.widgetStoreIds}}" stepKey="seeStoreAfterReset"/>
6161
<seeInField userInput="{{ProductsListWidget.sort_order}}" selector="{{AdminNewWidgetSection.widgetSortOrder}}" stepKey="seeSortOrderAfterReset"/>

0 commit comments

Comments
 (0)