MC-35843: Automate MC-26543 tests

Author: DianaRusin

app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminBundleProductSetAdvancedPricingActionGroup.xml

@@ -16,6 +16,6 @@
             <argument name="priceView" type="string" defaultValue="Price Range"/>
         </arguments>
         <remove keyForRemoval="selectProductCustomGroupValue"/>
-        <selectOption selector="{{AdminBundleProductFormAdvancedPricingSection.bundleAdvancedPriceView}}" userInput="{{priceView}}" stepKey="selectPriceView" before="clickDoneButton"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.bundleAdvancedPriceView}}" userInput="{{priceView}}" stepKey="selectPriceView" before="clickDoneButton"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Bundle/Test/Mftf/Page/AdminProductCreatePage.xml

@@ -10,6 +10,5 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="AdminProductCreatePage" url="catalog/product/new/set/{{set}}/type/{{type}}/" area="admin" module="Magento_Catalog" parameterized="true">
         <section name="AdminProductFormBundleSection"/>
-        <section name="AdminProductFormAdvancedPricingSection"/>
     </page>
 </pages>

app/code/Magento/Bundle/Test/Mftf/Section/AdminBundleProductFormAdvancedPricingSection.xml renamed to app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml

@@ -8,7 +8,7 @@
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-    <section name="AdminBundleProductFormAdvancedPricingSection">
+    <section name="AdminProductFormAdvancedPricingSection">
         <element name="bundleAdvancedPriceView" type="select" selector="div[data-index='advanced-pricing'] select[name='product[price_view]']"/>
     </section>
 </sections>

app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithDynamicTierPriceInCartTest.xml

@@ -16,10 +16,10 @@
         </annotations>
 
         <before>
-            <createData entity="VirtualProduct" stepKey="simpleProduct1">
+            <createData entity="VirtualProduct" stepKey="createProductForBundleItem1">
                 <field key="price">50.00</field>
             </createData>
-            <createData entity="SimpleProduct2" stepKey="simpleProduct2">
+            <createData entity="SimpleProduct2" stepKey="createProductForBundleItem2">
                 <field key="price">100.00</field>
             </createData>
         </before>

app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithOptionTierPriceInCartTest.xml

@@ -16,14 +16,14 @@
         </annotations>
 
         <before>
-            <createData entity="VirtualProduct" stepKey="simpleProduct1">
+            <createData entity="VirtualProduct" stepKey="createProductForBundleItem1">
                 <field key="price">50.00</field>
             </createData>
-            <createData entity="SimpleProduct2" stepKey="simpleProduct2">
+            <createData entity="SimpleProduct2" stepKey="createProductForBundleItem2">
                 <field key="price">100.00</field>
             </createData>
-            <createData entity="tierProductPrice50PercentDiscount" stepKey="addTierPrice">
-                <requiredEntity createDataKey="simpleProduct2"/>
+            <createData entity="TierProductPrice50PercentDiscount" stepKey="addTierPrice">
+                <requiredEntity createDataKey="createProductForBundleItem2"/>
             </createData>
         </before>
 

app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceWithFixedAndPercentOptionsInCartTest.xml

@@ -19,19 +19,19 @@
         </annotations>
 
         <before>
-            <createData entity="SimpleProduct2" stepKey="simpleProduct1">
+            <createData entity="SimpleProduct2" stepKey="createProductForBundleItem1">
                 <field key="price">100.00</field>
             </createData>
-            <createData entity="SimpleProduct2" stepKey="simpleProduct2">
+            <createData entity="SimpleProduct2" stepKey="createProductForBundleItem2">
                 <field key="price">100.00</field>
             </createData>
             <magentoCron groups="index" stepKey="runCronIndex"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
 
         <after>
-            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <deleteData createDataKey="createProductForBundleItem1" stepKey="deleteProductForBundleItem1"/>
+            <deleteData createDataKey="createProductForBundleItem2" stepKey="deleteProductForBundleItem2"/>
             <actionGroup ref="DeleteProductUsingProductGridActionGroup" stepKey="deleteBundle">
                 <argument name="product" value="BundleProduct"/>
             </actionGroup>
@@ -48,25 +48,23 @@
         <actionGroup ref="AddBundleOptionWithOneProductActionGroup" stepKey="addBundleOption1">
             <argument name="x" value="0"/>
             <argument name="n" value="1"/>
-            <argument name="prodOneSku" value="$simpleProduct1.sku$"/>
+            <argument name="prodOneSku" value="$createProductForBundleItem1.sku$"/>
             <argument name="prodTwoSku" value=""/>
             <argument name="optionTitle" value="Option1"/>
             <argument name="inputType" value="checkbox"/>
         </actionGroup>
-        <wait time="5" stepKey="vcbcvvc2"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYPrice('0', '0')}}" userInput="100" stepKey="fillBundleOption1Price"/>
         <selectOption selector="{{AdminProductFormBundleSection.bundlePriceType}}" userInput="Percent" stepKey="selectPercentPrice"/>
         <actionGroup ref="AddBundleOptionWithOneProductActionGroup" stepKey="addBundleOption2">
             <argument name="x" value="1"/>
             <argument name="n" value="2"/>
-            <argument name="prodOneSku" value="$simpleProduct2.sku$"/>
+            <argument name="prodOneSku" value="$createProductForBundleItem2.sku$"/>
             <argument name="prodTwoSku" value=""/>
             <argument name="optionTitle" value="Option2"/>
             <argument name="inputType" value="checkbox"/>
         </actionGroup>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYPrice('1', '0')}}" userInput="100" stepKey="fillBundleOption2Price"/>
         <scrollToTopOfPage stepKey="scrollToTopOfTheProductPage"/>
-        <wait time="5" stepKey="vcbcvvc"/>
         <actionGroup ref="AdminBundleProductSetAdvancedPricingActionGroup" stepKey="addProductTierPrice">
             <argument name="quantity" value="1"/>
             <argument name="price" value="Discount"/>

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

@@ -72,7 +72,7 @@
         <data key="quantity">3</data>
         <var key="sku" entityType="product" entityKey="sku" />
     </entity>
-    <entity name="tierProductPrice50PercentDiscount" type="catalogTierPrice">
+    <entity name="TierProductPrice50PercentDiscount" type="catalogTierPrice">
         <data key="price">50</data>
         <data key="price_type">discount</data>
         <data key="website_id">0</data>