Skip to content

Commit e3af8ae

Browse files
irenelagnoirenelagno
committed
Merge remote-tracking branch 'mainline/2.3-develop' into EPAM-PR-85
# Conflicts: # dev/tests/integration/testsuite/Magento/ProductAlert/Model/ObserverTest.php
2 parents 814c6f1 + d5104d5 commit e3af8ae

File tree

133 files changed

+2901
-303
lines changed

Some content is hidden

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

133 files changed

+2901
-303
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/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGrid.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@
7676
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
7777
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
7878

79+
<!-- Perform reindex and flush cache -->
80+
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
81+
<magentoCLI command="cache:flush" stepKey="flushCache"/>
82+
7983
<!--Go to category page-->
8084
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
8185
<waitForPageLoad stepKey="waitForHomePageToload"/>

‎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: 2 additions & 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"/>
@@ -157,6 +158,7 @@
157158
<element name="FolderName" type="button" selector="input[data-role='promptField']" />
158159
<element name="AcceptFolderName" type="button" selector=".action-primary.action-accept" timeout="30"/>
159160
<element name="StorageRootArrow" type="button" selector="#root > .jstree-icon" />
161+
<element name="FolderContainer" type="button" selector="div[data-role='tree']" />
160162
<element name="checkIfArrowExpand" type="button" selector="//li[@id='root' and contains(@class,'jstree-closed')]" />
161163
<element name="WysiwygArrow" type="button" selector="#d3lzaXd5Zw-- > .jstree-icon" />
162164
<element name="checkIfWysiwygArrowExpand" type="button" selector="//li[@id='d3lzaXd5Zw--' and contains(@class,'jstree-closed')]" />

‎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/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,12 @@
7070
<scrollTo selector="{{ProductDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="scrollToTinyMCE4" />
7171
<click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertImageIcon}}" stepKey="clickInsertImageIcon2" />
7272
<click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Browse}}" stepKey="clickBrowse2" />
73+
<waitForLoadingMaskToDisappear stepKey="waitForLoading13"/>
7374
<waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.CancelBtn}}" stepKey="waitForCancelButton2"/>
7475
<see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.CancelBtn}}" userInput="Cancel" stepKey="seeCancelBtn2" />
75-
<waitForLoadingMaskToDisappear stepKey="waitForLoading13"/>
76+
<waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.CreateFolder}}" stepKey="waitForCreateFolderBtn2"/>
7677
<see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.CreateFolder}}" userInput="Create Folder" stepKey="seeCreateFolderBtn2" />
77-
<waitForLoadingMaskToDisappear stepKey="waitForLoading14"/>
78+
<see selector="{{ProductDescriptionWYSIWYGToolbarSection.FolderContainer}}" userInput="Storage Root" stepKey="seeFolderContainer" />
7879
<click userInput="Storage Root" stepKey="clickOnRootFolder" />
7980
<waitForLoadingMaskToDisappear stepKey="waitForLoading15"/>
8081
<dontSeeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="dontSeeAddSelectedBtn3" />

0 commit comments

Comments
 (0)