Skip to content

Commit ddde72c

Browse files
author
Magento CICD
authored
merge magento/2.3-develop into magento-trigger/MAGETWO-89402
2 parents 43e0064 + 23df0f3 commit ddde72c

File tree

54 files changed

+1152
-59
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1152
-59
lines changed

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCreateRootCategoryActionGroup.xml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
11+
<!--Create a new root category-->
12+
<actionGroup name="AdminCreateRootCategory">
13+
<arguments>
14+
<argument name="categoryEntity" defaultValue="NewRootCategory"/>
15+
</arguments>
16+
<seeInCurrentUrl url="{{AdminCategoryPage.url}}" stepKey="seeOnCategoryPage"/>
17+
<click selector="{{AdminCategorySidebarActionSection.AddRootCategoryButton}}" stepKey="clickOnAddRootCategoryButton"/>
18+
<see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Category" stepKey="seeCategoryPageTitle"/>
19+
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{categoryEntity.name}}" stepKey="enterNewRootCategoryName"/>
20+
<click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="openSEO"/>
21+
<fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{categoryEntity.name_lwr}}" stepKey="enterURLKey"/>
22+
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
23+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear" />
24+
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccess"/>
25+
<seeInTitle userInput="{{categoryEntity.name}}" stepKey="seeNewCategoryPageTitle"/>
26+
<seeElement selector="{{AdminCategorySidebarTreeSection.categoryInTree(categoryEntity.name)}}" stepKey="seeCategoryInTree"/>
27+
</actionGroup>
28+
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
10+
<!--Click Add to Cart button in storefront product page-->
11+
<actionGroup name="StorefrontAddToCartCustomOptionsProductPageActionGroup">
12+
<arguments>
13+
<argument name="productName"/>
14+
</arguments>
15+
<click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCart"/>
16+
<waitForPageLoad stepKey="waitForPageLoad"/>
17+
<see selector="{{StorefrontMessagesSection.success}}" userInput="You added {{productName}} to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
18+
</actionGroup>
19+
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductData.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,4 +161,18 @@
161161
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
162162
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
163163
</entity>
164+
<entity name="productWithOptions" type="product">
165+
<var key="sku" entityType="product" entityKey="sku" />
166+
<data key="file">magento.jpg</data>
167+
<requiredEntity type="product_option">ProductOptionField</requiredEntity>
168+
<requiredEntity type="product_option">ProductOptionArea</requiredEntity>
169+
<requiredEntity type="product_option">ProductOptionFile</requiredEntity>
170+
<requiredEntity type="product_option">ProductOptionDropDown</requiredEntity>
171+
<requiredEntity type="product_option">ProductOptionRadiobutton</requiredEntity>
172+
<requiredEntity type="product_option">ProductOptionCheckbox</requiredEntity>
173+
<requiredEntity type="product_option">ProductOptionMultiSelect</requiredEntity>
174+
<requiredEntity type="product_option">ProductOptionDate</requiredEntity>
175+
<requiredEntity type="product_option">ProductOptionDateTime</requiredEntity>
176+
<requiredEntity type="product_option">ProductOptionTime</requiredEntity>
177+
</entity>
164178
</entities>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductOptionData.xml

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="ProductOptionField" type="product_option">
12+
<var key="product_sku" entityType="product" entityKey="sku" />
13+
<data key="title">OptionField</data>
14+
<data key="type">field</data>
15+
<data key="is_require">true</data>
16+
<data key="sort_order">1</data>
17+
<data key="price">10</data>
18+
<data key="price_type">fixed</data>
19+
<data key="max_characters">0</data>
20+
</entity>
21+
<entity name="ProductOptionArea" type="product_option">
22+
<var key="product_sku" entityType="product" entityKey="sku" />
23+
<data key="title">OptionArea</data>
24+
<data key="type">area</data>
25+
<data key="is_require">true</data>
26+
<data key="sort_order">2</data>
27+
<data key="price">10</data>
28+
<data key="price_type">percent</data>
29+
<data key="max_characters">0</data>
30+
</entity>
31+
<entity name="ProductOptionFile" type="product_option">
32+
<var key="product_sku" entityType="product" entityKey="sku" />
33+
<data key="title">OptionFile</data>
34+
<data key="type">file</data>
35+
<data key="is_require">true</data>
36+
<data key="sort_order">3</data>
37+
<data key="price">9.99</data>
38+
<data key="price_type">fixed</data>
39+
<data key="file_extension">png, jpg, gif</data>
40+
<data key="image_size_x">0</data>
41+
<data key="image_size_y">0</data>
42+
</entity>
43+
<entity name="ProductOptionDropDown" type="product_option">
44+
<var key="product_sku" entityType="product" entityKey="sku" />
45+
<data key="title">OptionDropDown</data>
46+
<data key="type">drop_down</data>
47+
<data key="sort_order">4</data>
48+
<data key="is_require">true</data>
49+
<requiredEntity type="product_option_value">ProductOptionValueDropdown1</requiredEntity>
50+
<requiredEntity type="product_option_value">ProductOptionValueDropdown2</requiredEntity>
51+
</entity>
52+
<entity name="ProductOptionRadiobutton" type="product_option">
53+
<var key="product_sku" entityType="product" entityKey="sku" />
54+
<data key="title">OptionRadioButtons</data>
55+
<data key="type">radio</data>
56+
<data key="sort_order">5</data>
57+
<data key="is_require">true</data>
58+
<requiredEntity type="product_option_value">ProductOptionValueRadioButtons1</requiredEntity>
59+
<requiredEntity type="product_option_value">ProductOptionValueRadioButtons2</requiredEntity>
60+
</entity>
61+
<entity name="ProductOptionCheckbox" type="product_option">
62+
<var key="product_sku" entityType="product" entityKey="sku" />
63+
<data key="title">OptionCheckbox</data>
64+
<data key="type">checkbox</data>
65+
<data key="sort_order">6</data>
66+
<data key="is_require">true</data>
67+
<requiredEntity type="product_option_value">ProductOptionValueCheckbox</requiredEntity>
68+
</entity>
69+
<entity name="ProductOptionMultiSelect" type="product_option">
70+
<var key="product_sku" entityType="product" entityKey="sku" />
71+
<data key="title">OptionMultiSelect</data>
72+
<data key="type">multiple</data>
73+
<data key="sort_order">7</data>
74+
<data key="is_require">true</data>
75+
<requiredEntity type="product_option_value">ProductOptionValueMultiSelect1</requiredEntity>
76+
<requiredEntity type="product_option_value">ProductOptionValueMultiSelect2</requiredEntity>
77+
</entity>
78+
<entity name="ProductOptionDate" type="product_option">
79+
<var key="product_sku" entityType="product" entityKey="sku" />
80+
<data key="title">OptionDate</data>
81+
<data key="type">date</data>
82+
<data key="sort_order">8</data>
83+
<data key="is_require">true</data>
84+
<data key="price">1234</data>
85+
<data key="price_type">fixed</data>
86+
</entity>
87+
<entity name="ProductOptionDateTime" type="product_option">
88+
<var key="product_sku" entityType="product" entityKey="sku" />
89+
<data key="title">OptionDateTime</data>
90+
<data key="type">date_time</data>
91+
<data key="sort_order">9</data>
92+
<data key="is_require">true</data>
93+
<data key="price">0.00</data>
94+
<data key="price_type">fixed</data>
95+
</entity>
96+
<entity name="ProductOptionTime" type="product_option">
97+
<var key="product_sku" entityType="product" entityKey="sku" />
98+
<data key="title">OptionTime</data>
99+
<data key="type">time</data>
100+
<data key="sort_order">10</data>
101+
<data key="is_require">true</data>
102+
<data key="price">0.00</data>
103+
<data key="price_type">percent</data>
104+
</entity>
105+
</entities>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductOptionValueData.xml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="ProductOptionValueDropdown1" type="product_option_value">
12+
<data key="title">OptionValueDropDown1</data>
13+
<data key="sort_order">1</data>
14+
<data key="price">0.01</data>
15+
<data key="price_type">fixed</data>
16+
</entity>
17+
<entity name="ProductOptionValueDropdown2" type="product_option_value">
18+
<data key="title">OptionValueDropDown2</data>
19+
<data key="sort_order">2</data>
20+
<data key="price">0.01</data>
21+
<data key="price_type">percent</data>
22+
</entity>
23+
<entity name="ProductOptionValueRadioButtons1" type="product_option_value">
24+
<data key="title">OptionValueRadioButtons1</data>
25+
<data key="sort_order">1</data>
26+
<data key="price">99.99</data>
27+
<data key="price_type">fixed</data>
28+
</entity>
29+
<entity name="ProductOptionValueRadioButtons2" type="product_option_value">
30+
<data key="title">OptionValueRadioButtons2</data>
31+
<data key="sort_order">2</data>
32+
<data key="price">99.99</data>
33+
<data key="price_type">percent</data>
34+
</entity>
35+
<entity name="ProductOptionValueCheckbox" type="product_option_value">
36+
<data key="title">OptionValueCheckbox</data>
37+
<data key="sort_order">1</data>
38+
<data key="price">123</data>
39+
<data key="price_type">percent</data>
40+
</entity>
41+
<entity name="ProductOptionValueMultiSelect1" type="product_option_value">
42+
<data key="title">OptionValueMultiSelect1</data>
43+
<data key="sort_order">1</data>
44+
<data key="price">1</data>
45+
<data key="price_type">fixed</data>
46+
</entity>
47+
<entity name="ProductOptionValueMultiSelect2" type="product_option_value">
48+
<data key="title">OptionValueMultiSelect2</data>
49+
<data key="sort_order">2</data>
50+
<data key="price">2</data>
51+
<data key="price_type">fixed</data>
52+
</entity>
53+
</entities>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product-meta.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<field key="sku">string</field>
1515
<field key="name">string</field>
1616
<field key="attribute_set_id">integer</field>
17-
<field key="price">integer</field>
17+
<field key="price">number</field>
1818
<field key="status">integer</field>
1919
<field key="visibility">integer</field>
2020
<field key="type_id">string</field>
@@ -40,7 +40,7 @@
4040
<field key="sku">string</field>
4141
<field key="name">string</field>
4242
<field key="attribute_set_id">integer</field>
43-
<field key="price">integer</field>
43+
<field key="price">number</field>
4444
<field key="status">integer</field>
4545
<field key="visibility">integer</field>
4646
<field key="type_id">string</field>
@@ -69,7 +69,7 @@
6969
<field key="sku">string</field>
7070
<field key="name">string</field>
7171
<field key="attribute_set_id">integer</field>
72-
<field key="price">integer</field>
72+
<field key="price">number</field>
7373
<field key="status">integer</field>
7474
<field key="visibility">integer</field>
7575
<field key="type_id">string</field>
@@ -95,7 +95,7 @@
9595
<field key="sku">string</field>
9696
<field key="name">string</field>
9797
<field key="attribute_set_id">integer</field>
98-
<field key="price">integer</field>
98+
<field key="price">number</field>
9999
<field key="status">integer</field>
100100
<field key="visibility">integer</field>
101101
<field key="type_id">string</field>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_option-meta.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<field key="type">string</field>
1616
<field key="sort_order">integer</field>
1717
<field key="is_require">boolean</field>
18-
<field key="price">integer</field>
18+
<field key="price">number</field>
1919
<field key="price_type">string</field>
2020
<field key="sku">string</field>
2121
<field key="file_extension">string</field>
@@ -33,7 +33,7 @@
3333
<field key="type">string</field>
3434
<field key="sort_order">integer</field>
3535
<field key="is_require">boolean</field>
36-
<field key="price">integer</field>
36+
<field key="price">number</field>
3737
<field key="price_type">string</field>
3838
<field key="sku">string</field>
3939
<field key="file_extension">string</field>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_option_value-meta.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
<operation name="CreateProductOptionValue" dataType="product_option_value" type="create">
1212
<field key="title">string</field>
1313
<field key="sort_order">integer</field>
14-
<field key="price">integer</field>
14+
<field key="price">number</field>
1515
<field key="price_type">string</field>
1616
<field key="sku">string</field>
1717
<field key="option_type_id">integer</field>
1818
</operation>
1919
<operation name="UpdateProductOptionValue" dataType="product_option_value" type="update">
2020
<field key="title">string</field>
2121
<field key="sort_order">integer</field>
22-
<field key="price">integer</field>
22+
<field key="price">number</field>
2323
<field key="price_type">string</field>
2424
<field key="sku">string</field>
2525
<field key="option_type_id">integer</field>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryBasicFieldSection.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="AdminCategoryBasicFieldSection">
1212
<element name="IncludeInMenu" type="checkbox" selector="input[name='include_in_menu']"/>
13+
<element name="includeInMenuLabel" type="text" selector="input[name='include_in_menu']+label"/>
1314
<element name="EnableCategory" type="checkbox" selector="input[name='is_active']"/>
15+
<element name="enableCategoryLabel" type="text" selector="input[name='is_active']+label"/>
1416
<element name="CategoryNameInput" type="input" selector="input[name='name']"/>
1517
<element name="ContentTab" type="input" selector="input[name='name']"/>
1618
<element name="FieldError" type="text" selector=".admin__field-error[data-bind='attr: {for: {{field}}}, text: error']" parameterized="true"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductCustomizableOptionsSection.xml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
11+
<section name="AdminProductCustomizableOptionsSection">
12+
<element name="checkIfCustomizableOptionsTabOpen" type="text" selector="//span[text()='Customizable Options']/parent::strong/parent::*[@data-state-collapsible='closed']"/>
13+
<element name="customezableOptions" type="text" selector="//strong[contains(@class, 'admin__collapsible-title')]/span[text()='Customizable Options']"/>
14+
<element name="useDefaultOptionTitle" type="text" selector="[data-index='options'] tr.data-row [data-index='title'] [name^='options_use_default']"/>
15+
<element name="useDefaultOptionTitleByIndex" type="text" selector="[data-index='options'] [data-index='values'] tr[data-repeat-index='{{var1}}'] [name^='options_use_default']" parameterized="true"/>
16+
<element name="addOptionBtn" type="button" selector="button[data-index='button_add']"/>
17+
<element name="fillOptionTitle" type="input" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//span[text()='Option Title']/parent::label/parent::div//input[@class='admin__control-text']" parameterized="true"/>
18+
<element name="checkSelect" type="select" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//span[text()='Option Type']/parent::label/parent::div//div[@data-role='selected-option']" parameterized="true"/>
19+
<element name="checkDropDown" type="select" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//parent::label/parent::div//li[@class='admin__action-multiselect-menu-inner-item']//label[text()='Drop-down']" parameterized="true"/>
20+
<element name="clickAddValue" type="button" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tfoot//button" parameterized="true"/>
21+
<element name="fillOptionValueTitle" type="input" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tbody/tr[@data-repeat-index='{{var2}}']//span[text()='Title']/parent::label/parent::div//div[@class='admin__field-control']/input" parameterized="true"/>
22+
<element name="fillOptionValuePrice" type="input" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tbody/tr[@data-repeat-index='{{var2}}']//span[text()='Price']/parent::label/parent::div//div[@class='admin__control-addon']/input" parameterized="true"/>
23+
<element name="clickSelectPriceType" type="select" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tbody//tr[@data-repeat-index='{{var2}}']//span[text()='Price Type']/parent::label/parent::div//select" parameterized="true"/>
24+
<element name="checkboxUseDefaultTitle" type="checkbox" selector="//span[text()='Option Title']/parent::label/parent::div/div//input[@type='checkbox']"/>
25+
<element name="checkboxUseDefaultOption" type="checkbox" selector="//table[@data-index='values']//tbody//tr[@data-repeat-index='{{var1}}']//div[@class='admin__field-control']//input[@type='checkbox']" parameterized="true"/>
26+
</section>
27+
</sections>

0 commit comments

Comments
 (0)