Skip to content

Commit 54e53ea

Browse files
committed
MAGETWO-97237: Delete Product Staging Update when the Product is used
1 parent f08a5fd commit 54e53ea

File tree

4 files changed

+42
-1
lines changed

4 files changed

+42
-1
lines changed

app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,23 @@
5858
<waitForPageLoad stepKey="waitForDeleteLoad"/>
5959
<see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been deleted" stepKey="seeSuccess"/>
6060
</actionGroup>
61+
<actionGroup name="AdminCreateProductLinkWidgetActionGroup" extends="AdminCreateProductsListWidgetActionGroup">
62+
<arguments>
63+
<argument name="product"/>
64+
</arguments>
65+
<remove keyForRemoval="clickAddNewCondition"/>
66+
<remove keyForRemoval="selectCondition"/>
67+
<remove keyForRemoval="waitRuleParameter"/>
68+
<remove keyForRemoval="clickRuleParameter"/>
69+
<remove keyForRemoval="clickChooser"/>
70+
<remove keyForRemoval="waitForAjaxLoad"/>
71+
<remove keyForRemoval="clickSelectAll"/>
72+
<remove keyForRemoval="clickApplyRuleParameter"/>
73+
<selectOption selector="{{AdminNewWidgetSection.selectTemplate}}" userInput="{{widget.template}}" after="waitForPageLoad" stepKey="setTemplate"/>
74+
<waitForAjaxLoad after="setTemplate" stepKey="waitForPageLoad2"/>
75+
<click selector="{{AdminNewWidgetSection.selectProduct}}" after="clickWidgetOptions" stepKey="clickSelectProduct"/>
76+
<fillField selector="{{AdminNewWidgetSelectProductPopupSection.filterBySku}}" userInput="{{product.sku}}" after="clickSelectProduct" stepKey="fillProductNameInFilter"/>
77+
<click selector="{{AdminDataGridHeaderSection.applyFilters}}" after="fillProductNameInFilter" stepKey="applyFilter"/>
78+
<click selector="{{AdminNewWidgetSelectProductPopupSection.firstRow}}" after="applyFilter" stepKey="selectProduct"/>
79+
</actionGroup>
6180
</actionGroups>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,9 @@
1919
<data key="display_on">All Pages</data>
2020
<data key="container">Main Content Area</data>
2121
</entity>
22+
<entity name="ProductLinkWidget" extends="ProductsListWidget">
23+
<remove keyForRemoval="condition"/>
24+
<data key="type">Catalog Product Link</data>
25+
<data key="template">Product Link Block Template</data>
26+
</entity>
2227
</entities>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminNewWidgetSection">
1212
<element name="widgetType" type="select" selector="#code"/>
1313
<element name="widgetDesignTheme" type="select" selector="#theme_id"/>
@@ -17,6 +17,7 @@
1717
<element name="addLayoutUpdate" type="button" selector=".action-default.scalable.action-add"/>
1818
<element name="selectDisplayOn" type="select" selector="#widget_instance[0][page_group]"/>
1919
<element name="selectContainer" type="select" selector="#all_pages_0>table>tbody>tr>td:nth-child(1)>div>div>select"/>
20+
<element name="selectTemplate" type="select" selector=".widget-layout-updates .block_template_container .select"/>
2021
<element name="widgetOptions" type="select" selector="#widget_instace_tabs_properties_section"/>
2122
<element name="addNewCondition" type="select" selector=".rule-param.rule-param-new-child"/>
2223
<element name="selectCondition" type="input" selector="#conditions__1__new_child"/>
@@ -25,5 +26,6 @@
2526
<element name="applyParameter" type="button" selector=".rule-param-apply"/>
2627
<element name="openChooser" type="button" selector=".rule-chooser-trigger"/>
2728
<element name="selectAll" type="checkbox" selector=".admin__control-checkbox"/>
29+
<element name="selectProduct" type="button" selector=".btn-chooser" timeout="30"/>
2830
</section>
2931
</sections>
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
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="AdminNewWidgetSelectProductPopupSection">
12+
<element name="filterBySku" type="input" selector=".data-grid-filters input[name='chooser_sku']"/>
13+
<element name="firstRow" type="select" selector=".even>td" timeout="20"/>
14+
</section>
15+
</sections>

0 commit comments

Comments
 (0)