Skip to content

Commit e94ea09

Browse files
magento-cicd2magento-cicd2
authored
merge magento/2.2-develop into magento-tsg-csl3/MC-19539
2 parents e23c5a8 + 41c0af2 commit e94ea09

21 files changed

+431
-78
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -345,9 +345,4 @@
345345
<data key="quantity">0</data>
346346
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
347347
</entity>
348-
<entity name="ProductFileOptionWithScriptTag" type="product">
349-
<var key="sku" entityType="product" entityKey="sku"/>
350-
<data key="file">&lt;img src=x onerror='alert("XSS without &lt;script&gt;&lt;:script&gt; tags...")'&gt;.png</data>
351-
<requiredEntity type="product_option">ProductOptionFile</requiredEntity>
352-
</entity>
353348
</entities>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
-->
88

99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="StorefrontProductAdditionalInformationSection">
1212
<element name="additionalInfoTab" type="button" selector="#tab-label-additional-title"/>
1313
<element name="additionalInfoContainer" type="block" selector="#additional"/>
1414
<element name="attributeLabel" type="text" selector="#product-attribute-specs-table .col.label"/>
1515
<element name="attributeValue" type="text" selector="#product-attribute-specs-table .col.data"/>
16+
<!-- The tab transform to an accordion when window resize -->
17+
<element name="moreInformationSectionToggleState" type="button" selector="#tab-label-additional[aria-expanded='{{expanded}}']" parameterized="true"/>
1618
</section>
1719
</sections>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@
77
-->
88

99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="StorefrontProductInfoDetailsSection">
1212
<element name="productNameForReview" type="text" selector=".legend.review-legend>strong" />
13+
<element name="detailsTab" type="button" selector="#tab-label-description-title" />
14+
<!-- The tab transform to an accordion when window resize -->
15+
<element name="detailsSectionToggleState" type="button" selector="#tab-label-description[aria-expanded='{{expanded}}']" parameterized="true" />
1316
</section>
1417
</sections>

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontVerifyCannotLoadFileWithIncorrectNameThroughCustomOptionsTest.xml

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎app/code/Magento/Review/Test/Mftf/ActionGroup/AdminChangeReviewStatusActionGroup.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminChangeReviewStatusActionGroup">
11+
<arguments>
12+
<argument name="status" type="string" defaultValue="1"/>
13+
</arguments>
14+
<selectOption selector="{{AdminReviewEditSection.status}}" userInput="{{status}}" stepKey="changeReviewStatus"/>
15+
</actionGroup>
16+
</actionGroups>

‎app/code/Magento/Review/Test/Mftf/ActionGroup/AdminDeleteReviewsByUserNicknameActionGroup.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminDeleteReviewsByUserNicknameActionGroup">
11+
<arguments>
12+
<argument name="nickname" type="string" defaultValue="{{SimpleProductReview.nickname}}"/>
13+
</arguments>
14+
<click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clearFilters"/>
15+
<fillField selector="{{AdminReviewGridSection.nicknameColumnFilter}}" userInput="{{nickname}}" stepKey="fillNickname"/>
16+
<click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFilters"/>
17+
<selectOption selector="{{AdminReviewGridSection.massActions}}" userInput="selectAll" stepKey="selectAll"/>
18+
<selectOption selector="{{AdminReviewGridSection.massActionsSelect}}" userInput="delete" stepKey="clickDeleteActionDropdown"/>
19+
<click selector="{{AdminReviewGridSection.submit}}" stepKey="clickSubmit"/>
20+
<waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModalPopUp"/>
21+
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmProductDelete"/>
22+
<waitForElementVisible selector="{{StorefrontMessagesSection.successMessage}}" stepKey="waitForSuccessMessage"/>
23+
<see selector="{{StorefrontMessagesSection.successMessage}}" userInput="record(s) have been deleted." stepKey="seeSuccessMessage"/>
24+
</actionGroup>
25+
</actionGroups>

‎app/code/Magento/Review/Test/Mftf/ActionGroup/AdminOpenPendingReviewsPageActionGroup.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminOpenPendingReviewsPageActionGroup">
11+
<amOnPage url="{{AdminPendingReviewsPage.url}}" stepKey="openReviewsPageActionGroup"/>
12+
</actionGroup>
13+
</actionGroups>

‎app/code/Magento/Review/Test/Mftf/ActionGroup/AdminOpenReviewByUserNicknameActionGroup.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminOpenReviewByUserNicknameActionGroup">
11+
<arguments>
12+
<argument name="nickname" type="string" defaultValue="{{SimpleProductReview.nickname}}"/>
13+
</arguments>
14+
<click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clearFilters"/>
15+
<fillField selector="{{AdminReviewGridSection.nicknameColumnFilter}}" userInput="{{nickname}}" stepKey="fillNickname"/>
16+
<click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFilters"/>
17+
<click selector="{{AdminDataGridTableSection.row('1')}}" stepKey="clickFirstRow"/>
18+
<waitForPageLoad stepKey="waitForEditReviewPageLoad"/>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/Review/Test/Mftf/ActionGroup/AdminOpenReviewsPageActionGroup.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminOpenReviewsPageActionGroup">
11+
<amOnPage url="{{AdminReviewsPage.url}}" stepKey="openReviewsPageActionGroup"/>
12+
</actionGroup>
13+
</actionGroups>

‎app/code/Magento/Review/Test/Mftf/ActionGroup/AdminSaveReviewActionGroup.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminSaveReviewActionGroup">
11+
<click selector="{{AdminReviewEditSection.saveReview}}" stepKey="saveReview"/>
12+
<waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForSuccessMessage"/>
13+
<see selector="{{AdminMessagesSection.successMessage}}" userInput="You saved the review." stepKey="seeSuccessMessage"/>
14+
</actionGroup>
15+
</actionGroups>

0 commit comments

Comments
 (0)