Skip to content

Commit e907219

Browse files
committed
MAGETWO-97237: Delete Product Staging Update when the Product is used
1 parent 626d3dd commit e907219

File tree

5 files changed

+37
-10
lines changed

5 files changed

+37
-10
lines changed
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="RelatedProductLink" type="product_link">
12+
<var key="sku" entityKey="sku" entityType="product2"/>
13+
<var key="linked_product_sku" entityKey="sku" entityType="product"/>
14+
<data key="link_type">related</data>
15+
<data key="linked_product_type">simple</data>
16+
<data key="position">1</data>
17+
<requiredEntity type="product_link_extension_attribute">Qty1000</requiredEntity>
18+
</entity>
19+
</entities>
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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="OneRelatedProductLink" type="product_links">
12+
<requiredEntity type="product_link">RelatedProductLink</requiredEntity>
13+
</entity>
14+
</entities>

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,23 +65,17 @@
6565
<waitForPageLoad stepKey="waitForDeleteLoad"/>
6666
<see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been deleted" stepKey="seeSuccess"/>
6767
</actionGroup>
68-
<actionGroup name="AdminCreateProductLinkWidgetActionGroup" extends="AdminCreateProductsListWidgetActionGroup">
68+
<actionGroup name="AdminCreateProductLinkWidgetActionGroup" extends="AdminCreateWidgetActionGroup">
6969
<arguments>
7070
<argument name="product"/>
7171
</arguments>
72-
<remove keyForRemoval="clickAddNewCondition"/>
73-
<remove keyForRemoval="selectCondition"/>
74-
<remove keyForRemoval="waitRuleParameter"/>
75-
<remove keyForRemoval="clickRuleParameter"/>
76-
<remove keyForRemoval="clickChooser"/>
77-
<remove keyForRemoval="waitForAjaxLoad"/>
78-
<remove keyForRemoval="clickSelectAll"/>
79-
<remove keyForRemoval="clickApplyRuleParameter"/>
8072
<selectOption selector="{{AdminNewWidgetSection.selectTemplate}}" userInput="{{widget.template}}" after="waitForPageLoad" stepKey="setTemplate"/>
8173
<waitForAjaxLoad after="setTemplate" stepKey="waitForPageLoad2"/>
8274
<click selector="{{AdminNewWidgetSection.selectProduct}}" after="clickWidgetOptions" stepKey="clickSelectProduct"/>
8375
<fillField selector="{{AdminNewWidgetSelectProductPopupSection.filterBySku}}" userInput="{{product.sku}}" after="clickSelectProduct" stepKey="fillProductNameInFilter"/>
8476
<click selector="{{AdminDataGridHeaderSection.applyFilters}}" after="fillProductNameInFilter" stepKey="applyFilter"/>
8577
<click selector="{{AdminNewWidgetSelectProductPopupSection.firstRow}}" after="applyFilter" stepKey="selectProduct"/>
78+
<click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveWidget"/>
79+
<see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
8680
</actionGroup>
8781
</actionGroups>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
<data key="restrict_type">Header</data>
3434
</entity>
3535
<entity name="ProductLinkWidget" extends="ProductsListWidget">
36-
<remove keyForRemoval="condition"/>
3736
<data key="type">Catalog Product Link</data>
3837
<data key="template">Product Link Block Template</data>
3938
</entity>

app/code/Magento/Widget/Test/Mftf/Page/AdminNewWidgetPage.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
1111
<page name="AdminNewWidgetPage" url="admin/widget_instance/new/" area="admin" module="Magento_Widget">
1212
<section name="AdminNewWidgetSection"/>
13+
<section name="AdminNewWidgetSelectProductPopupSection"/>
1314
</page>
1415
</pages>

0 commit comments

Comments
 (0)