From fe069b20803d56a84411696d49edb97c42abcd69 Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Tue, 17 Sep 2019 12:32:44 +0300
Subject: [PATCH] MC-13641: Saving configurable product with custom product
 attribute (images as swatches)

---
 .../Catalog/Test/Mftf/Data/ProductData.xml    |  5 --
 ...hIncorrectNameThroughCustomOptionsTest.xml | 71 -------------------
 ...ithout <script><:script> tags...\")'>.png" |  0
 3 files changed, 76 deletions(-)
 delete mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/StorefrontVerifyCannotLoadFileWithIncorrectNameThroughCustomOptionsTest.xml
 delete mode 100644 "dev/tests/acceptance/tests/_data/<img src=x onerror='alert(\"XSS without <script><:script> tags...\")'>.png"

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index 1ea2af8927a0..e122615eb8aa 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -517,11 +517,6 @@
         <requiredEntity type="product_option">ProductOptionArea</requiredEntity>
         <requiredEntity type="product_option">ProductOptionFile</requiredEntity>
     </entity>
-    <entity name="ProductFileOptionWithScriptTag" type="product">
-        <var key="sku" entityType="product" entityKey="sku"/>
-        <data key="file">&lt;img src=x onerror='alert("XSS without &lt;script&gt;&lt;:script&gt; tags...")'&gt;.png</data>
-        <requiredEntity type="product_option">ProductOptionFile</requiredEntity>
-    </entity>
     <entity name="ApiVirtualProductWithDescription" type="product">
         <data key="sku" unique="suffix">api-virtual-product</data>
         <data key="type_id">virtual</data>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontVerifyCannotLoadFileWithIncorrectNameThroughCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontVerifyCannotLoadFileWithIncorrectNameThroughCustomOptionsTest.xml
deleted file mode 100644
index 2ea8e8820b1b..000000000000
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontVerifyCannotLoadFileWithIncorrectNameThroughCustomOptionsTest.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontVerifyCannotLoadFileWithIncorrectNameThroughCustomOptionsTest">
-        <annotations>
-            <features value="Catalog"/>
-            <stories value="Custom options"/>
-            <title value="Verify cannot load file with incorrect name through Custom options"/>
-            <description value="Verify cannot load file with incorrect name through Custom options"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-13104"/>
-            <group value="catalog"/>
-        </annotations>
-        <before>
-            <!-- Create customer -->
-            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-            <!-- Create category -->
-            <createData entity="_defaultCategory" stepKey="createCategory"/>
-            <!-- Create simple product -->
-            <createData entity="_defaultProduct" stepKey="createProduct">
-                <requiredEntity createDataKey="createCategory"/>
-            </createData>
-            <!-- Add file upload custom option to the product -->
-            <updateData createDataKey="createProduct" entity="ProductFileOptionWithScriptTag" stepKey="updateProductWithOption"/>
-            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
-        </before>
-        <after>
-            <!-- Delete product -->
-            <deleteData createDataKey="createProduct" stepKey="deleteSimpleProduct"/>
-            <!-- Delete category -->
-            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <!-- Delete customer -->
-            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
-        </after>
-
-        <!-- Login to storefront -->
-        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
-            <argument name="Customer" value="$$createCustomer$$"/>
-        </actionGroup>
-
-        <!-- Open product page -->
-        <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductPage">
-            <argument name="productUrlKey" value="$$createProduct.custom_attributes[url_key]$$"/>
-        </actionGroup>
-
-        <!-- Upload file -->
-        <actionGroup ref="StorefrontAttachOptionFileActionGroup" stepKey="selectAndAttachFile">
-            <argument name="optionTitle" value="ProductOptionFile"/>
-            <argument name="file" value="ProductFileOptionWithScriptTag.file"/>
-        </actionGroup>
-
-        <!-- Add product to cart -->
-        <click selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="clickAddToCartButton"/>
-        <waitForPageLoad stepKey="waitForProductAddToCart"/>
-
-        <!-- Assert alert message -->
-        <waitForElementVisible selector="{{StorefrontProductPageSection.alertMessage}}" stepKey="waitForElementVisible"/>
-        <see selector="{{StorefrontProductPageSection.alertMessage}}" userInput="The file is empty. Select another file and try again." stepKey="seeAlertMessage"/>
-
-        <!-- Assert cart is empty -->
-        <actionGroup ref="assertMiniCartEmpty" stepKey="assertMiniCartEmpty"/>
-    </test>
-</tests>
diff --git "a/dev/tests/acceptance/tests/_data/<img src=x onerror='alert(\"XSS without <script><:script> tags...\")'>.png" "b/dev/tests/acceptance/tests/_data/<img src=x onerror='alert(\"XSS without <script><:script> tags...\")'>.png"
deleted file mode 100644
index e69de29bb2d1..000000000000