MC-20071: Fix Skipped MFTF Tests From MC-17140: MAGETWO-98211, MC-56, MC-88

Author: zakdma

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

@@ -1303,4 +1303,9 @@
     <entity name="SimpleProductUpdatePrice16" type="product2">
         <data key="price">16.00</data>
     </entity>
+    <entity name="ProductWithTwoTextFieldOptions" type="product">
+        <var key="sku" entityType="product" entityKey="sku" />
+        <requiredEntity type="product_option">ProductOptionField</requiredEntity>
+        <requiredEntity type="product_option">ProductOptionField2</requiredEntity>
+    </entity>
 </entities>

app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml

@@ -11,6 +11,7 @@
     <entity name="ProductOptionField" type="product_option">
         <var key="product_sku" entityType="product" entityKey="sku" />
         <data key="title">OptionField</data>
+        <data key="sku">OptionField</data>
         <data key="type">field</data>
         <data key="is_require">true</data>
         <data key="sort_order">1</data>
@@ -21,6 +22,7 @@
     <entity name="ProductOptionField2" type="product_option">
         <var key="product_sku" entityType="product" entityKey="sku" />
         <data key="title">OptionField2</data>
+        <data key="sku">OptionField2</data>
         <data key="type">field</data>
         <data key="is_require">true</data>
         <data key="sort_order">1</data>

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

@@ -24,6 +24,9 @@
             <createData entity="ApiCategory" stepKey="createCategory"/>
             <!-- Create two products -->
             <createData entity="SimpleProduct2" stepKey="createFirstProduct"/>
+            <updateData entity="ProductWithTwoTextFieldOptions" createDataKey="createFirstProduct" stepKey="updateFirstProductWithCustomOptions">
+                <requiredEntity createDataKey="createFirstProduct"/>
+            </updateData>
             <createData entity="ApiSimpleProduct" stepKey="createSecondProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
@@ -40,16 +43,6 @@
             <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearProductGridFilter"/>
             <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
         </after>
-        <!--Go to product page -->
-        <amOnPage url="{{AdminProductEditPage.url($$createFirstProduct.id$$)}}" stepKey="goToProductEditPage"/>
-        <waitForPageLoad stepKey="waitForProductEditPageLoad"/>
-        <actionGroup ref="AddProductCustomOptionField" stepKey="addCutomOption1">
-            <argument name="option" value="ProductOptionField"/>
-        </actionGroup>
-        <actionGroup ref="AddProductCustomOptionField" stepKey="addCutomOption2">
-            <argument name="option" value="ProductOptionField2"/>
-        </actionGroup>
-        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
         <!--Change second product sku to first product sku-->
         <amOnPage url="{{AdminProductEditPage.url($$createSecondProduct.id$$)}}" stepKey="goToProductEditPage1"/>
         <waitForPageLoad stepKey="waitForProductEditPageLoad1"/>
@@ -68,7 +61,7 @@
             <argument name="optionIndex" value="1"/>
         </actionGroup>
         <!--Save product and check sku changed message-->
-        <actionGroup ref="saveProductForm" stepKey="saveProduct1"/>
+        <actionGroup ref="saveProductForm" stepKey="saveSecondProduct"/>
         <see selector="{{AdminMessagesSection.notice}}" userInput="SKU for product $$createSecondProduct.name$$ has been changed to $$createFirstProduct.sku$$-1." stepKey="seeSkuChangedMessage"/>
     </test>
 </tests>