Skip to content

Commit e8227ef

Browse files
author
OlgaVasyltsun
committed
Merge remote-tracking branch 'origin/MC-13641' into 2.3-develop-pr77
2 parents 2cf88bf + e53c11f commit e8227ef

File tree

115 files changed

+6221
-681
lines changed

Some content is hidden

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

115 files changed

+6221
-681
lines changed

‎app/code/Magento/Braintree/composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
"magento/module-sales": "*",
2323
"magento/module-ui": "*",
2424
"magento/module-vault": "*",
25-
"magento/module-multishipping": "*"
25+
"magento/module-multishipping": "*",
26+
"magento/module-theme": "*"
2627
},
2728
"suggest": {
28-
"magento/module-checkout-agreements": "*",
29-
"magento/module-theme": "*"
29+
"magento/module-checkout-agreements": "*"
3030
},
3131
"type": "magento2-module",
3232
"license": [

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,4 +411,29 @@
411411
<click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton"/>
412412
<click selector="{{AdminCategoryContentSection.productTableRow}}" stepKey="selectProductFromTableRow"/>
413413
</actionGroup>
414+
415+
<actionGroup name="DeleteDefaultCategoryChildren">
416+
<annotations>
417+
<description>Deletes all children categories of Default Root Category.</description>
418+
</annotations>
419+
420+
<amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToAdminCategoryPage"/>
421+
<executeInSelenium function="function ($webdriver) use ($I) {
422+
$children = $webdriver->findElements(\Facebook\WebDriver\WebDriverBy::xpath('//ul[contains(@class, \'x-tree-node-ct\')]/li[@class=\'x-tree-node\' and contains(.,
423+
\'{{DefaultCategory.name}}\')]/ul[contains(@class, \'x-tree-node-ct\')]/li//a'));
424+
while (!empty($children)) {
425+
$I->click('//ul[contains(@class, \'x-tree-node-ct\')]/li[@class=\'x-tree-node\' and contains(.,
426+
\'{{DefaultCategory.name}}\')]/ul[contains(@class, \'x-tree-node-ct\')]/li//a');
427+
$I->waitForPageLoad(30);
428+
$I->click('#delete');
429+
$I->waitForElementVisible('aside.confirm .modal-footer button.action-accept');
430+
$I->click('aside.confirm .modal-footer button.action-accept');
431+
$I->waitForPageLoad(30);
432+
$I->waitForElementVisible('#messages div.message-success', 30);
433+
$I->see('You deleted the category.', '#messages div.message-success');
434+
$children = $webdriver->findElements(\Facebook\WebDriver\WebDriverBy::xpath('//ul[contains(@class, \'x-tree-node-ct\')]/li[@class=\'x-tree-node\' and contains(.,
435+
\'{{DefaultCategory.name}}\')]/ul[contains(@class, \'x-tree-node-ct\')]/li//a'));
436+
}
437+
}" stepKey="deleteAllChildCategories"/>
438+
</actionGroup>
414439
</actionGroups>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,14 @@
117117
<data key="is_active">true</data>
118118
<data key="include_in_menu">true</data>
119119
</entity>
120+
<entity name="DefaultCategory" type="category">
121+
<data key="name">Default Category</data>
122+
</entity>
123+
<!-- Category from file "export_import_configurable_product.csv" -->
124+
<entity name="CategoryExportImport" extends="SimpleSubCategory" type="category">
125+
<data key="name">CategoryExportImport</data>
126+
</entity>
127+
<entity name="SubCategoryNonAnchor" extends="SubCategoryWithParent">
128+
<requiredEntity type="custom_attribute">CustomAttributeCategoryNonAnchor</requiredEntity>
129+
</entity>
120130
</entities>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,8 @@
5151
<data key="attribute_code">short_description</data>
5252
<data key="value">Short Fixedtest 555</data>
5353
</entity>
54+
<entity name="CustomAttributeCategoryNonAnchor" type="custom_attribute">
55+
<data key="attribute_code">is_anchor</data>
56+
<data key="value">0</data>
57+
</entity>
5458
</entities>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,8 @@
2020
<data key="store_id">0</data>
2121
<data key="label" unique="suffix">attributeThree</data>
2222
</entity>
23+
<entity name="ProductAttributeFrontendLabelForExportImport" type="FrontendLabel">
24+
<data key="store_id">0</data>
25+
<data key="label">attributeExportImport</data>
26+
</entity>
2327
</entities>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,7 @@
1818
<data key="type">image/png</data>
1919
<data key="name" unique="prefix">magento-logo.png</data>
2020
</entity>
21+
<entity name="MagentoLogoImageContentExportImport" extends="MagentoLogoImageContent" type="ImageContent">
22+
<data key="name">magento-logo.png</data>
23+
</entity>
2124
</entities>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,4 +376,9 @@
376376
<data key="frontend_label">Size</data>
377377
<data key="attribute_code" unique="suffix">size_attr</data>
378378
</entity>
379+
<!-- Product attribute from file "export_import_configurable_product.csv" -->
380+
<entity name="ProductAttributeWithTwoOptionsForExportImport" extends="productAttributeDropdownTwoOptions" type="ProductAttribute">
381+
<data key="attribute_code">attribute</data>
382+
<requiredEntity type="FrontendLabel">ProductAttributeFrontendLabelForExportImport</requiredEntity>
383+
</entity>
379384
</entities>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,9 @@
3030
<data key="disabled">false</data>
3131
<requiredEntity type="ImageContent">MagentoLogoImageContent</requiredEntity>
3232
</entity>
33+
<!-- From file "export_import_configurable_product.csv" -->
34+
<entity name="ApiProductAttributeMediaGalleryForExportImport" extends="ApiProductAttributeMediaGalleryEntryTestImage" type="ProductAttributeMediaGalleryEntry">
35+
<data key="label">Magento Logo</data>
36+
<requiredEntity type="ImageContent">MagentoLogoImageContentExportImport</requiredEntity>
37+
</entity>
3338
</entities>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,11 @@
8686
<data key="label" unique="suffix">White</data>
8787
<data key="value" unique="suffix">white</data>
8888
</entity>
89+
<!-- Product attribute options from file "export_import_configurable_product.csv" -->
90+
<entity name="ProductAttributeOptionOneForExportImport" extends="productAttributeOption1" type="ProductAttributeOption">
91+
<data key="label">option1</data>
92+
</entity>
93+
<entity name="ProductAttributeOptionTwoForExportImport" extends="productAttributeOption2" type="ProductAttributeOption">
94+
<data key="label">option2</data>
95+
</entity>
8996
</entities>

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,11 @@
351351
<data key="filename">adobe-base</data>
352352
<data key="file_extension">jpg</data>
353353
</entity>
354+
<entity name="TestImage" extends="TestImageAdobe" type="image">
355+
<data key="title" unique="suffix">test_image</data>
356+
<data key="file">test_image.jpg</data>
357+
<data key="filename">test_image</data>
358+
</entity>
354359
<entity name="ProductWithUnicode" type="product">
355360
<data key="sku" unique="suffix">&#38657;&#20135;&#21697;</data>
356361
<data key="type_id">simple</data>
@@ -512,6 +517,11 @@
512517
<requiredEntity type="product_option">ProductOptionArea</requiredEntity>
513518
<requiredEntity type="product_option">ProductOptionFile</requiredEntity>
514519
</entity>
520+
<entity name="ProductFileOptionWithScriptTag" type="product">
521+
<var key="sku" entityType="product" entityKey="sku"/>
522+
<data key="file">&lt;img src=x onerror='alert("XSS without &lt;script&gt;&lt;:script&gt; tags...")'&gt;.png</data>
523+
<requiredEntity type="product_option">ProductOptionFile</requiredEntity>
524+
</entity>
515525
<entity name="ApiVirtualProductWithDescription" type="product">
516526
<data key="sku" unique="suffix">api-virtual-product</data>
517527
<data key="type_id">virtual</data>
@@ -1165,6 +1175,15 @@
11651175
<requiredEntity type="product_extension_attribute">EavStock10</requiredEntity>
11661176
<requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
11671177
</entity>
1178+
<!-- Products from file "export_import_configurable_product.csv" -->
1179+
<entity name="ApiSimpleOneExportImport" extends="ApiSimpleOne" type="product2">
1180+
<data key="sku">api-simple-one-export-import</data>
1181+
<data key="name">Api Simple Product One Export Import</data>
1182+
</entity>
1183+
<entity name="ApiSimpleTwoExportImport" extends="ApiSimpleTwo" type="product2">
1184+
<data key="sku">api-simple-two-export-import</data>
1185+
<data key="name">Api Simple Product Two Export Import</data>
1186+
</entity>
11681187
<entity name="SimpleProductPrice10Qty1" type="product">
11691188
<data key="sku" unique="suffix">simple-product_</data>
11701189
<data key="type_id">simple</data>

0 commit comments

Comments
 (0)