Skip to content

Commit 1a7ae45

Browse files
magento-mts-svcmagento-mts-svc
authored
merge magento/2.3-develop into magento-engcom/2.3-develop-expedited-prs
2 parents 892e87d + 3f336e8 commit 1a7ae45

File tree

55 files changed

+1500
-179
lines changed

Some content is hidden

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

55 files changed

+1500
-179
lines changed

‎app/code/Magento/Backend/Test/Mftf/Data/GeneralLocalConfigsData.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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="GeneralLocalCodeConfigsForChina">
12+
<data key="path">general/locale/code</data>
13+
<data key="scope">websites</data>
14+
<data key="scope_code">base</data>
15+
<data key="value">zh_Hans_CN</data>
16+
</entity>
17+
<entity name="GeneralLocalCodeConfigsForUS">
18+
<data key="path">general/locale/code</data>
19+
<data key="scope">websites</data>
20+
<data key="scope_code">base</data>
21+
<data key="value">en_US</data>
22+
</entity>
23+
</entities>

‎app/code/Magento/Backend/Test/Mftf/Section/LocaleOptionsSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@
1515
<element name="localeEnabled" type="select" selector="#general_locale_code:enabled"/>
1616
<element name="localeDisabled" type="select" selector="#general_locale_code[disabled=disabled]"/>
1717
<element name="useDefault" type="checkbox" selector="#general_locale_timezone_inherit"/>
18+
<element name="defaultLocale" type="checkbox" selector="#general_locale_code_inherit"/>
1819
</section>
1920
</sections>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@
213213
</arguments>
214214

215215
<amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
216+
<waitForPageLoad stepKey="waitForAttributeGridPageLoad"/>
216217
<fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="{{ProductAttributeCode}}" stepKey="setAttributeCode"/>
217218
<click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
218219
<click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="clickOnAttributeRow"/>
@@ -319,6 +320,11 @@
319320
<selectOption selector="{{AttributePropertiesSection.ValueRequired}}" stepKey="checkRequired" userInput="{{attribute.is_required_admin}}"/>
320321
<click stepKey="saveAttribute" selector="{{AttributePropertiesSection.Save}}"/>
321322
</actionGroup>
323+
<actionGroup name="AdminCreateSearchableProductAttribute" extends="createProductAttribute" insertAfter="checkRequired">
324+
<click selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="goToStorefrontPropertiesTab"/>
325+
<waitForElementVisible selector="{{StorefrontPropertiesSection.PageTitle}}" stepKey="waitTabLoad"/>
326+
<selectOption selector="{{AdvancedAttributePropertiesSection.UseInSearch}}" userInput="Yes" stepKey="setSearchable"/>
327+
</actionGroup>
322328

323329
<!-- Inputs text default value and attribute code-->
324330
<actionGroup name="createProductAttributeWithTextField" extends="createProductAttribute" insertAfter="checkRequired">

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,16 @@
6464
<fillField selector="{{AdminProductAttributeSetSection.name}}" userInput="{{label}}" stepKey="fillName"/>
6565
<click selector="{{AdminProductAttributeSetSection.saveBtn}}" stepKey="clickSave1"/>
6666
</actionGroup>
67+
<actionGroup name="AdminAddUnassignedAttributeToGroup" extends="CreateDefaultAttributeSet">
68+
<arguments>
69+
<argument name="firstOption" type="string" defaultValue="color"/>
70+
<argument name="secondOption" type="string" defaultValue="material"/>
71+
<argument name="group" type="string" defaultValue="Product Details"/>
72+
</arguments>
73+
<dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute(firstOption)}}" selector2="{{AdminProductAttributeSetSection.attribute(group)}}" stepKey="unassign1"/>
74+
<dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute(secondOption)}}" selector2="{{AdminProductAttributeSetSection.attribute(group)}}" stepKey="unassign2"/>
75+
<click selector="{{AdminProductAttributeSetSection.saveBtn}}" stepKey="clickSaveButton"/>
76+
</actionGroup>
6777

6878
<actionGroup name="goToAttributeGridPage">
6979
<annotations>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,10 @@
108108
<data key="used_for_sort_by">true</data>
109109
<requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
110110
</entity>
111+
<entity name="multipleSelectProductAttribute" extends="productDropDownAttribute" type="ProductAttribute">
112+
<data key="frontend_input">multiselect</data>
113+
<data key="frontend_input_admin">Multiple Select</data>
114+
</entity>
111115
<entity name="productDropDownAttributeNotSearchable" type="ProductAttribute">
112116
<data key="attribute_code" unique="suffix">attribute</data>
113117
<data key="frontend_input">select</data>

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,23 @@
6868
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
6969
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
7070
</entity>
71+
<entity name="ProductWithSpecialSymbols" extends="SimpleProduct" type="product">
72+
<data key="name">SimpleProduct -+~/\\&lt;&gt;\’“:*\$#@()!,.?`=%&amp;^</data>
73+
</entity>
74+
<entity name="SimpleProductBeforeUpdate" type="product">
75+
<data key="sku">simpleProduct</data>
76+
<data key="type_id">simple</data>
77+
<data key="attribute_set_id">4</data>
78+
<data key="name" unique="suffix">SimpleProduct</data>
79+
<data key="price">123.00</data>
80+
<data key="visibility">4</data>
81+
<data key="status">1</data>
82+
<data key="quantity">1000</data>
83+
<data key="urlKey">simpleProduct</data>
84+
<data key="weight">1</data>
85+
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
86+
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
87+
</entity>
7188
<entity name="SimpleProductAfterImport1" type="product">
7289
<data key="sku">SimpleProductForTest1</data>
7390
<data key="type_id">simple</data>
@@ -1072,6 +1089,10 @@
10721089
<entity name="productAlphabeticalB" type="product" extends="_defaultProduct">
10731090
<data key="name" unique="suffix">BBB Product</data>
10741091
</entity>
1092+
<entity name="simpleProductWithShortNameAndSku" type="product" extends="defaultSimpleProduct">
1093+
<data key="name">Test_Product</data>
1094+
<data key="sku">test_sku</data>
1095+
</entity>
10751096
<entity name="productWithSpecialCharacters" type="product" extends="_defaultProduct">
10761097
<data key="name" unique="suffix">Product "!@#$%^&amp;*()+:;\|}{][?=~` </data>
10771098
<data key="nameWithSafeChars" unique="suffix">|}{][?=~` </data>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="AdminProductFormSection">
11+
<element name="additionalOptions" type="select" selector=".admin__control-multiselect"/>
1112
<element name="datepickerNewAttribute" type="input" selector="[data-index='{{attrName}}'] input" timeout="30" parameterized="true"/>
1213
<element name="attributeSet" type="select" selector="div[data-index='attribute_set_id'] .admin__field-control"/>
1314
<element name="attributeSetFilter" type="input" selector="div[data-index='attribute_set_id'] .admin__field-control input" timeout="30"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="StorefrontCategorySidebarSection">
11+
<element name="layeredFilterBlock" type="block" selector="#layered-filter-block"/>
1112
<element name="filterOptionsTitle" type="text" selector="//div[@class='filter-options-title' and contains(text(), '{{var1}}')]" parameterized="true"/>
1213
<element name="filterOptions" type="text" selector=".filter-options-content .items"/>
1314
<element name="filterOption" type="text" selector=".filter-options-content .item"/>

‎app/code/Magento/CatalogSearch/Test/Mftf/Data/CatalogSearchData.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,10 @@
2323
<entity name="SetMinQueryLengthToOne" type="number">
2424
<data key="value">1</data>
2525
</entity>
26-
26+
<entity name="SetCatalogSearchEngineToDefault" type="catalog_search_engine_default">
27+
<requiredEntity type="enable">DefaultCatalogSearchEngine</requiredEntity>
28+
</entity>
29+
<entity name="DefaultCatalogSearchEngine" type="enable">
30+
<data key="inherit">true</data>
31+
</entity>
2732
</entities>

‎app/code/Magento/CatalogSearch/Test/Mftf/Metadata/catalog_search-meta.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,15 @@
2929
</object>
3030
</object>
3131
</operation>
32+
<operation name="CatalogSearchEngineDefault" dataType="catalog_search_engine_default" type="create" auth="adminFormKey" url="/admin/system_config/save/section/catalog/" method="POST">
33+
<object key="groups" dataType="catalog_search_engine_default">
34+
<object key="search" dataType="catalog_search_engine_default">
35+
<object key="fields" dataType="catalog_search_engine_default">
36+
<object key="engine" dataType="enable">
37+
<field key="inherit">boolean</field>
38+
</object>
39+
</object>
40+
</object>
41+
</object>
42+
</operation>
3243
</operations>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="CheckoutCartSummarySection">
12+
<element name="orderTotal" type="input" selector=".grand.totals .amount .price"/>
13+
<element name="subTotal" type="input" selector="span[data-th='Subtotal']"/>
1214
<element name="expandShoppingCartSummary" type="button" selector="//*[contains(@class, 'items-in-cart')][not(contains(@class, 'active'))]"/>
1315
<element name="elementPosition" type="text" selector=".data.table.totals > tbody tr:nth-of-type({{value}}) > th" parameterized="true"/>
1416
<element name="subtotal" type="text" selector="//*[@id='cart-totals']//tr[@class='totals sub']//td//span[@class='price']"/>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,47 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="CreateConfigurableProductWithAttributeSet">
12+
<annotations>
13+
<description>Admin edit created product as configurable. Choose created options</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="product" defaultValue="_defaultProduct"/>
17+
<argument name="category" defaultValue="_defaultCategory"/>
18+
<argument name="label" type="string" defaultValue="mySet"/>
19+
<argument name="option" type="string" defaultValue="['option1', 'option2', 'option3', 'option4']"/>
20+
</arguments>
21+
<click selector="{{AdminProductFormSection.attributeSet}}" stepKey="startEditAttrSet"/>
22+
<fillField selector="{{AdminProductFormSection.attributeSetFilter}}" userInput="{{label}}" stepKey="searchForAttrSet"/>
23+
<click selector="{{AdminProductFormSection.attributeSetFilterResult}}" stepKey="selectAttrSet"/>
24+
<fillField userInput="{{product.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
25+
<selectOption selector="{{AdminProductFormSection.additionalOptions}}" parameterArray="{{option}}" stepKey="searchAndMultiSelectCreatedOption"/>
26+
</actionGroup>
27+
<actionGroup name="AdminCreateConfigurationsForAttribute" extends="generateConfigurationsByAttributeCode">
28+
<annotations>
29+
<description>EXTENDS: generateConfigurationsByAttributeCode. Click to apply single price to all Skus. Enter Attribute price</description>
30+
</annotations>
31+
<arguments>
32+
<argument name="price" type="string" defaultValue="100"/>
33+
</arguments>
34+
<waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.applySinglePriceToAllSkus}}" after="clickOnNextButton2" stepKey="waitForNextPageOpened2"/>
35+
<click selector="{{AdminCreateProductConfigurationsPanel.applySinglePriceToAllSkus}}" after="waitForNextPageOpened2" stepKey="clickOnApplySinglePriceToAllSkus"/>
36+
<fillField selector="{{AdminCreateProductConfigurationsPanel.singlePrice}}" userInput="{{price}}" before="clickOnApplySingleQuantityToEachSku" stepKey="enterAttributePrice"/>
37+
</actionGroup>
38+
<actionGroup name="AdminCreateConfigurableProductWithAttributeUncheckOption" extends="generateConfigurationsByAttributeCode">
39+
<annotations>
40+
<description>EXTENDS: generateConfigurationsByAttributeCode. Click to uncheck created option. Enter Attribute price</description>
41+
</annotations>
42+
<arguments>
43+
<argument name="attributeOption" type="string" defaultValue="option1"/>
44+
<argument name="price" type="string" defaultValue="100"/>
45+
</arguments>
46+
<click selector="{{AdminCreateProductConfigurationsPanel.attributeOption('attributeOption')}}" after="clickOnSelectAll" stepKey="clickToUncheckOption"/>
47+
<click selector="{{AdminCreateProductConfigurationsPanel.next}}" after="clickToUncheckOption" stepKey="clickOnNextButton22"/>
48+
<waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.applySinglePriceToAllSkus}}" after="clickOnNextButton22" stepKey="waitForNextPageOpened2"/>
49+
<click selector="{{AdminCreateProductConfigurationsPanel.applySinglePriceToAllSkus}}" after="waitForNextPageOpened2" stepKey="clickOnApplySinglePriceToAllSkus"/>
50+
<fillField selector="{{AdminCreateProductConfigurationsPanel.singlePrice}}" userInput="{{price}}" before="clickOnApplySingleQuantityToEachSku" stepKey="enterAttributePrice"/>
51+
</actionGroup>
1152
<!--Filter the product grid and view expected products-->
1253
<actionGroup name="viewConfigurableProductInAdminGrid">
1354
<annotations>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,21 @@
7777
<var key="sku" entityKey="sku" entityType="product" />
7878
<var key="childSku" entityKey="sku" entityType="product2"/>
7979
</entity>
80+
<entity name="ConfigurableProductWithAttributeSet" type="product">
81+
<data key="sku" unique="suffix">configurable</data>
82+
<data key="type_id">configurable</data>
83+
<data key="attribute_set_id">4</data>
84+
<data key="attribute_set_name">mySet</data>
85+
<data key="visibility">4</data>
86+
<data key="name" unique="suffix">Configurable product</data>
87+
<data key="price">1.00</data>
88+
<data key="weight">2</data>
89+
<data key="urlKey" unique="suffix">configurableurlkey</data>
90+
<data key="status">1</data>
91+
<data key="quantity">100</data>
92+
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
93+
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
94+
</entity>
8095
<entity name="ConfigurableProductPrice10Qty1" type="product">
8196
<data key="sku" unique="suffix">configurable-product_</data>
8297
<data key="type_id">configurable</data>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminCreateProductConfigurationsPanel">
12+
<element name="attributeOption" type="checkbox" selector="li[data-attribute-option-title='{{colorOption}}']" parameterized="true"/>
1213
<element name="next" type="button" selector=".steps-wizard-navigation .action-next-step" timeout="30"/>
1314
<element name="createNewAttribute" type="button" selector=".select-attributes-actions button[title='Create New Attribute']" timeout="30"/>
1415
<element name="filters" type="button" selector="button[data-action='grid-filter-expand']"/>

0 commit comments

Comments
 (0)