Skip to content

Commit b55839a

Browse files
VeronikaYaratsVeronikaYarats
committed
Merge remote-tracking branch 'remotes/github/MAGETWO-96106' into EPAM-PR-22
2 parents 95f10c7 + e245d04 commit b55839a

File tree

6 files changed

+119
-0
lines changed

6 files changed

+119
-0
lines changed

‎app/code/Magento/Cms/Test/Mftf/Data/BlockData.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="Sales25offBlock" type="block">
12+
<data key="title" unique="suffix">Sales25off</data>
13+
<data key="identifier" unique="suffix">Sales25off</data>
14+
<data key="store_id">All Store Views</data>
15+
<data key="content">sales25off everything!</data>
16+
<data key="is_active">0</data>
17+
</entity>
18+
</entities>

‎app/code/Magento/Cms/Test/Mftf/Page/AdminCmsEditBlockPage.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+
9+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
11+
<page name="AdminEditBlockPage" url="cms/block/edit/block_id" area="admin" module="Magento_Cms">
12+
<section name="AdminUpdateBlockSection"/>
13+
</page>
14+
</pages>

‎app/code/Magento/Cms/Test/Mftf/Section/AdminBlockGridSection.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminBlockGridSection">
12+
<element name="search" type="input" selector="//input[@placeholder='Search by keyword']"/>
13+
<element name="searchButton" type="button" selector="//div[@class='data-grid-search-control-wrap']//label[@class='data-grid-search-label']/following-sibling::button[@class='action-submit']"/>
14+
<element name="checkbox" type="checkbox" selector="//label[@class='data-grid-checkbox-cell-inner']//input[@class='admin__control-checkbox']"/>
15+
<element name="select" type="select" selector="//tr[@class='data-row']//button[@class='action-select']"/>
16+
<element name="editInSelect" type="text" selector="//a[contains(text(), 'Edit')]"/>
17+
</section>
18+
</sections>

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

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
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="AdminCreateWidgetWithBlockActionGroup">
11+
<arguments>
12+
<argument name="widget"/>
13+
<argument name="block" type="string"/>
14+
</arguments>
15+
<amOnPage url="{{AdminNewWidgetPage.url}}" stepKey="createWidgetPage"/>
16+
<selectOption selector="{{AdminNewWidgetSection.widgetType}}" userInput="{{widget.type}}" stepKey="selectWidgetType"/>
17+
<selectOption selector="{{AdminNewWidgetSection.widgetDesignTheme}}" userInput="{{widget.designTheme}}" stepKey="selectWidgetDesignTheme"/>
18+
<click selector="{{AdminNewWidgetSection.continue}}" stepKey="continue"/>
19+
<waitForElement selector="{{AdminNewWidgetSection.widgetTitle}}" time="30" stepKey="waitForElement"/>
20+
<fillField selector="{{AdminNewWidgetSection.widgetTitle}}" userInput="{{widget.name}}" stepKey="fillWidgetTitle"/>
21+
<selectOption selector="{{AdminNewWidgetSection.widgetStoreIds}}" userInput="{{widget.store_id}}" stepKey="selectWidgetStoreView"/>
22+
<click selector="{{AdminNewWidgetSection.addLayoutUpdate}}" stepKey="clickAddLayoutUpdate"/>
23+
<waitForPageLoad stepKey="waitForLoad1"/>
24+
<scrollTo selector="{{AdminNewWidgetSection.selectDisplayOn}}" stepKey="scrollToElement" />
25+
<selectOption selector="{{AdminNewWidgetSection.selectDisplayOn}}" userInput="{{widget.display}}" stepKey="selectWidgetDisplayOn"/>
26+
<waitForElement selector="{{AdminNewWidgetSection.selectContainer}}" time="30" stepKey="waitForContainer"/>
27+
<selectOption selector="{{AdminNewWidgetSection.selectContainer}}" userInput="{{widget.container}}" stepKey="selectWidgetContainer"/>
28+
<scrollToTopOfPage stepKey="scrollToAddresses"/>
29+
<waitForAjaxLoad stepKey="waitForAjaxLoad1"/>
30+
<click selector="{{AdminNewWidgetSection.widgetOptions}}" stepKey="goToWidgetOptions"/>
31+
<waitForElement selector="{{AdminNewWidgetSection.widgetSelectBlock}}" time="60" stepKey="waitForSelectBlock"/>
32+
<click selector="{{AdminNewWidgetSection.widgetSelectBlock}}" stepKey="openSelectBlock"/>
33+
<waitForPageLoad stepKey="waitForLoadBlocks"/>
34+
<selectOption selector="{{AdminNewWidgetSection.blockStatus}}" userInput="Disable" stepKey="chooseStatus"/>
35+
<fillField selector="{{AdminNewWidgetSection.selectBlockTitle}}" userInput="{{block}}" stepKey="fillBlockTitle"/>
36+
<click selector="{{AdminNewWidgetSection.searchBlock}}" stepKey="searchBlock"/>
37+
<waitForAjaxLoad stepKey="waitForAjaxLoad"/>
38+
<click selector="{{AdminNewWidgetSection.searchedBlock}}" stepKey="clickSearchedBlock"/>
39+
<waitForPageLoad stepKey="wait"/>
40+
<click selector="{{AdminNewWidgetSection.saveWidget}}" stepKey="saveWidget"/>
41+
<waitForPageLoad stepKey="waitForSaving"/>
42+
<see userInput="The widget instance has been saved." stepKey="seeSuccessMessage"/>
43+
</actionGroup>
44+
</actionGroups>

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="WidgetWithBlock" type="widget">
12+
<data key="type">CMS Static Block</data>
13+
<data key="designTheme">Magento Luma</data>
14+
<data key="name" unique="suffix">testName</data>
15+
<data key="store_id">All Store Views</data>
16+
<data key="display">All Pages</data>
17+
<data key="container">Page Top</data>
18+
</entity>
19+
</entities>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@
2525
<element name="applyParameter" type="button" selector=".rule-param-apply"/>
2626
<element name="openChooser" type="button" selector=".rule-chooser-trigger"/>
2727
<element name="selectAll" type="checkbox" selector=".admin__control-checkbox"/>
28+
<element name="widgetSelectBlock" type="button" selector="//button[@class='action-default scalable btn-chooser']"/>
29+
<element name="selectBlockTitle" type="input" selector="//input[@name='chooser_title']"/>
30+
<element name="searchBlock" type="button" selector="//div[@class='admin__filter-actions']/button[@title='Search']"/>
31+
<element name="blockStatus" type="select" selector="//select[@name='chooser_is_active']"/>
32+
<element name="searchedBlock" type="button" selector="//*[@class='magento-message']//tbody/tr/td[1]"/>
33+
<element name="saveWidget" type="select" selector="#save"/>
2834
<element name="displayMode" type="select" selector="select[id*='display_mode']"/>
2935
<element name="restrictTypes" type="select" selector="select[id*='types']"/>
3036
<element name="saveAndContinue" type="button" selector="#save_and_edit_button" timeout="30"/>

0 commit comments

Comments
 (0)