Skip to content

Commit 492d2e3

Browse files
soumyausoumyau
authored
Merge pull request #88 from magento-pangolin/MC-4328
MC-4328
2 parents 8897d87 + a433a77 commit 492d2e3

File tree

8 files changed

+94
-0
lines changed

8 files changed

+94
-0
lines changed

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9+
<actionGroup name="AdminAddMinimumAdvertisedPriceActionGroup">
10+
<arguments>
11+
<argument name="msrpData" type="entity"/>
12+
</arguments>
13+
<waitForPageLoad stepKey="waitForPageLoad"/>
14+
<click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
15+
<waitForElementVisible selector="{{AdminProductFormAdvancedPricingSection.msrp}}" stepKey="waitSpecialPrice"/>
16+
<fillField selector="{{AdminProductFormAdvancedPricingSection.msrp}}" userInput="{{msrpData.msrp}}" stepKey="fillMinimumAdvertisedPrice"/>
17+
<selectOption selector="{{AdminProductFormAdvancedPricingSection.msrpType}}" userInput="{{msrpData.msrp_display_actual_price_type}}" stepKey="selectPriceType"/>
18+
<click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDone"/>
19+
<waitForElementNotVisible selector="{{AdminProductFormAdvancedPricingSection.msrp}}" stepKey="waitForCloseModalWindow"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,28 @@
167167
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
168168
<requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
169169
</entity>
170+
<entity name="SimpleProductDisabled" type="product">
171+
<data key="sku" unique="suffix">simple_product_disabled</data>
172+
<data key="type_id">simple</data>
173+
<data key="attribute_set_id">4</data>
174+
<data key="name" unique="suffix">Simple Product Disabled</data>
175+
<data key="price">123.00</data>
176+
<data key="visibility">4</data>
177+
<data key="status">2</data>
178+
<data key="quantity">1001</data>
179+
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
180+
</entity>
181+
<entity name="SimpleProductNotVisibleIndividually" type="product">
182+
<data key="sku" unique="suffix">simple_product_not_visible_individually</data>
183+
<data key="type_id">simple</data>
184+
<data key="attribute_set_id">4</data>
185+
<data key="name" unique="suffix">Simple Product Not Visible Individually</data>
186+
<data key="price">123.00</data>
187+
<data key="visibility">1</data>
188+
<data key="status">1</data>
189+
<data key="quantity">1000</data>
190+
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
191+
</entity>
170192
<entity name="NewSimpleProduct" type="product">
171193
<data key="price">321.00</data>
172194
</entity>
@@ -446,6 +468,10 @@
446468
<var key="sku" entityType="product" entityKey="sku" />
447469
<requiredEntity type="product_option">ProductOptionDropDownWithLongValuesTitle</requiredEntity>
448470
</entity>
471+
<entity name="productWithDropdownOption" type="product">
472+
<var key="sku" entityType="product" entityKey="sku" />
473+
<requiredEntity type="product_option">ProductOptionValueDropdown</requiredEntity>
474+
</entity>
449475
<entity name="ProductWithTextFieldAndAreaOptions" type="product">
450476
<var key="sku" entityType="product" entityKey="sku" />
451477
<requiredEntity type="product_option">ProductOptionField</requiredEntity>

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,15 @@
8888
<requiredEntity type="product_option_value">ProductOptionValueDropdownLongTitle1</requiredEntity>
8989
<requiredEntity type="product_option_value">ProductOptionValueDropdownLongTitle2</requiredEntity>
9090
</entity>
91+
<entity name="ProductOptionValueDropdown" type="product_option">
92+
<var key="product_sku" entityType="product" entityKey="sku" />
93+
<data key="title">OptionDropDown</data>
94+
<data key="type">drop_down</data>
95+
<data key="sort_order">4</data>
96+
<data key="is_require">true</data>
97+
<requiredEntity type="product_option_value">ProductOptionValueWithSkuDropdown1</requiredEntity>
98+
<requiredEntity type="product_option_value">ProductOptionValueWithSkuDropdown2</requiredEntity>
99+
</entity>
91100
<entity name="ProductOptionRadiobutton" type="product_option">
92101
<var key="product_sku" entityType="product" entityKey="sku" />
93102
<data key="title">OptionRadioButtons</data>

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionValueData.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,18 @@
8787
<data key="price_type">percent</data>
8888
<data key="sku">sku_drop_down_row_1</data>
8989
</entity>
90+
<entity name="ProductOptionValueWithSkuDropdown1" type="product_option_value">
91+
<data key="title">ProductOptionValueWithSkuDropdown1</data>
92+
<data key="sort_order">1</data>
93+
<data key="price">10</data>
94+
<data key="price_type">fixed</data>
95+
<data key="sku">product_option_value_sku_dropdown_1_</data>
96+
</entity>
97+
<entity name="ProductOptionValueWithSkuDropdown2" type="product_option_value">
98+
<data key="title">ProductOptionValueWithSkuDropdown2</data>
99+
<data key="sort_order">1</data>
100+
<data key="price">10</data>
101+
<data key="price_type">fixed</data>
102+
<data key="sku">product_option_value_sku_dropdown_2_</data>
103+
</entity>
90104
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,12 @@
5656
<data key="quantity">2</data>
5757
<var key="sku" entityType="product2" entityKey="sku" />
5858
</entity>
59+
<entity name="tierProductPriceDefault" type="catalogTierPrice">
60+
<data key="price">90.00</data>
61+
<data key="price_type">fixed</data>
62+
<data key="website_id">0</data>
63+
<data key="customer_group">ALL GROUPS</data>
64+
<data key="quantity">30</data>
65+
<var key="sku" entityType="product" entityKey="sku" />
66+
</entity>
5967
</entities>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<element name="specialPrice" type="input" selector="input[name='product[special_price]']"/>
2323
<element name="doneButton" type="button" selector=".product_form_product_form_advanced_pricing_modal button.action-primary" timeout="5"/>
2424
<element name="msrp" type="input" selector="//input[@name='product[msrp]']" timeout="30"/>
25+
<element name="msrpType" type="select" selector="//select[@name='product[msrp_display_actual_price_type]']" timeout="30"/>
2526
<element name="save" type="button" selector="#save-button"/>
2627
</section>
2728
</sections>

‎app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,6 @@
4141
<element name="productOptionLabel" type="text" selector="//dl[@class='item-options']"/>
4242
<element name="checkoutCartProductPrice" type="text" selector="//td[@class='col price']//span[@class='price']"/>
4343
<element name="checkoutCartSubtotal" type="text" selector="//td[@class='col subtotal']//span[@class='price']"/>
44+
<element name="emptyCart" selector=".cart-empty" type="text"/>
4445
</section>
4546
</sections>

‎app/code/Magento/Msrp/Test/Mftf/Data/MsrpData.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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
10+
<entity name="MsrpBeforeOrderConfirmation" type="minimum_advertised_price">
11+
<data key="msrp">600</data>
12+
<data key="msrp_display_actual_price_type">Before Order Confirmation</data>
13+
</entity>
14+
</entities>

0 commit comments

Comments
 (0)