MAGETWO-70232: Import customizable options adds it to another product if same SKU is filled

- Update automated test script

Author: Lusine-Papyan

app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml

@@ -52,7 +52,6 @@
         <selectOption selector="{{AdminProductCustomizableOptionsSection.optionPriceType('0')}}" userInput="{{option.price_type}}" stepKey="selectPriceType"/>
         <fillField selector="{{AdminProductCustomizableOptionsSection.optionFileExtensions('0')}}" userInput="{{option.file_extension}}" stepKey="fillCompatibleExtensions"/>
     </actionGroup>
-
     <actionGroup name="AddProductCustomOptionField">
         <arguments>
             <argument name="option" defaultValue="ProductOptionField"/>
@@ -69,7 +68,6 @@
         <selectOption selector="{{AdminProductCustomizableOptionsSection.optionPriceType(optionIndex)}}" userInput="{{option.price_type}}" stepKey="selectPriceType"/>
         <fillField selector="{{AdminProductCustomizableOptionsSection.optionSku(optionIndex)}}" userInput="{{option.title}}" stepKey="fillSku"/>
     </actionGroup>
-
     <actionGroup name="importProductCustomizableOptions">
         <arguments>
             <argument name="productName" type="string"/>
@@ -84,13 +82,11 @@
         <checkOption selector="{{AdminProductImportOptionsSection.firstRowItemCheckbox}}"  stepKey="checkProductCheckbox"/>
         <click selector="{{AdminProductImportOptionsSection.importButton}}" stepKey="clickImport"/>
     </actionGroup>
-
     <actionGroup name="resetImportOptionFilter">
         <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" visible="false" stepKey="openCustomOptionSection"/>
         <click selector="{{AdminProductCustomizableOptionsSection.importOptions}}" stepKey="clickImportOptions"/>
         <click selector="{{AdminProductImportOptionsSection.resetFiltersButton}}" stepKey="clickResetFilterButton"/>
     </actionGroup>
-
     <actionGroup name="checkCustomizableOptionImport">
         <arguments>
             <argument name="option" defaultValue="ProductOptionField"/>
@@ -99,7 +95,6 @@
         <grabValueFrom selector="{{AdminProductCustomizableOptionsSection.optionTitleInput(optionIndex)}}" stepKey="grabOptionTitle"/>
         <grabValueFrom selector="{{AdminProductCustomizableOptionsSection.optionPrice(optionIndex)}}" stepKey="grabOptionPrice"/>
         <grabValueFrom selector="{{AdminProductCustomizableOptionsSection.optionSku(optionIndex)}}" stepKey="grabOptionSku"/>
-
         <assertEquals expected="{{option.title}}" expectedType="string" actual="$grabOptionTitle" stepKey="assertOptionTitle"/>
         <assertEquals expected="{{option.price}}" expectedType="string" actual="$grabOptionPrice" stepKey="assertOptionPrice"/>
         <assertEquals expected="{{option.title}}" expectedType="string" actual="$grabOptionSku" stepKey="assertOptionSku"/>

app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml

@@ -54,6 +54,6 @@
         <element name="applyFiltersButton" type="button" selector="//button[@data-action='grid-filter-apply']" timeout="30"/>
         <element name="resetFiltersButton" type="button" selector="//button[@data-action='grid-filter-reset']" timeout="30"/>
         <element name="firstRowItemCheckbox" type="input" selector="//input[@data-action='select-row']" timeout="30"/>
-        <element name="importButton" type="button" selector="//button[@class='action-primary']/span[contains(text(), 'Import')]" timeout="30"/>
+        <element name="importButton" type="button" selector="//button[contains(@class, 'action-primary')]/span[contains(text(), 'Import')]" timeout="30"/>
     </section>
 </sections>

app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml

@@ -11,41 +11,39 @@
     <test name="AdminImportCustomizableOptionToProductWithSKUTest">
         <annotations>
             <features value="Catalog"/>
-            <title value="Check that 'trie price' block not available for simple product from options without 'trie price'"/>
-            <description value="Check that 'trie price' block not available for simple product from options without 'trie price'"/>
+            <title value="Import customizable options to a product with existing SKU"/>
+            <description value="Import customizable options to a product with existing SKU"/>
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-98211"/>
             <useCaseId value="MAGETWO-70232"/>
             <group value="catalog"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-
             <!--Create category-->
+            <comment userInput="Create category" stepKey="commentCreateCategory"/>
             <createData entity="ApiCategory" stepKey="createCategory"/>
-
             <!-- Create two product -->
+            <comment userInput="Create two product" stepKey="commentCreateTwoProduct"/>
             <createData entity="SimpleProduct2" stepKey="createFirstProduct"/>
             <createData entity="ApiSimpleProduct" stepKey="createSecondProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
-
         </before>
         <after>
-
-           <!--Delete second product with changed sku-->
+            <!--Delete second product with changed sku-->
+            <comment userInput="Delete second product with changed sku" stepKey="commentDeleteProduct"/>
             <actionGroup ref="deleteProductBySku" stepKey="deleteSecondProduct">
                 <argument name="sku" value="$$createFirstProduct.sku$$-1"/>
             </actionGroup>
-
             <!--Delete created data-->
+            <comment userInput="Delete created data" stepKey="commentDeleteCreatedData"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createFirstProduct" stepKey="deleteFirstProduct"/>
-
             <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
         </after>
-
         <!--Go to product page -->
+        <comment userInput="Go to product page" stepKey="commentGoToProductPage"/>
         <amOnPage url="{{AdminProductEditPage.url($$createFirstProduct.id$$)}}" stepKey="goToProductEditPage"/>
         <waitForPageLoad stepKey="waitForProductEditPageLoad"/>
         <actionGroup ref="AddProductCustomOptionField" stepKey="addCutomOption1">
@@ -57,13 +55,13 @@
             <argument name="optionIndex" value="1"/>
         </actionGroup>
         <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-
         <!--Change second product sku to first product sku-->
+        <comment userInput="Change second product sku to first product sku" stepKey="commentChangeSecondProduct"/>
         <amOnPage url="{{AdminProductEditPage.url($$createSecondProduct.id$$)}}" stepKey="goToProductEditPage1"/>
         <waitForPageLoad stepKey="waitForProductEditPageLoad1"/>
         <fillField selector="{{AdminProductFormSection.productSku}}" userInput="$$createFirstProduct.sku$$" stepKey="fillProductSku1"/>
-
         <!--Import customizable options and check-->
+        <comment userInput="Import customizable options and check" stepKey="commentImportOptions"/>
         <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" visible="false" stepKey="openCustomOptionSection"/>
         <actionGroup ref="importProductCustomizableOptions" stepKey="importOptions">
             <argument name="productName" value="$$createFirstProduct.name$$"/>
@@ -76,8 +74,8 @@
             <argument name="option" value="ProductOptionField2"/>
             <argument name="optionIndex" value="1"/>
         </actionGroup>
-
-        <!--SAve product and check sku changed message-->
+        <!--Save product and check sku changed message-->
+        <comment userInput="Save product and check sku changed message" stepKey="commentSAveProductAndCheck"/>
         <actionGroup ref="saveProductForm" stepKey="saveProduct1"/>
         <see userInput="SKU for product $$createSecondProduct.name$$ has been changed to $$createFirstProduct.sku$$-1." stepKey="seeSkuChangedMessage"/>
     </test>

app/code/Magento/Catalog/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.xml

@@ -11,8 +11,8 @@
     <test name="AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest">
         <annotations>
             <features value="Catalog"/>
-            <title value="Check that 'trie price' block not available for simple product from options without 'trie price'"/>
-            <description value="Check that 'trie price' block not available for simple product from options without 'trie price'"/>
+            <title value="Check that 'tier price' block not available for simple product from options without 'tier price'"/>
+            <description value="Check that 'tier price' block not available for simple product from options without 'tier price'"/>
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-97050"/>
             <useCaseId value="MAGETWO-96842"/>