Merge remote-tracking branch 'origin/MAGETWO-91697' into MAGETWO-91697

Author: nikshostko

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

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="CatalogPriceScopeWebsite" type="catalog_price_config_state">
+        <requiredEntity type="scope">scopeWebsite</requiredEntity>
+        <requiredEntity type="default_product_price">defaultProductPrice</requiredEntity>
+    </entity>
+    <entity name="scopeWebsite" type="scope">
+        <data key="value">1</data>
+    </entity>
+    <entity name="defaultProductPrice" type="default_product_price">
+        <data key="value">0</data>
+    </entity>
+
+    <entity name="DefaultConfigCatalogPrice" type="catalog_price_config_state">
+        <requiredEntity type="scope">scopeGlobal</requiredEntity>
+        <requiredEntity type="default_product_price">defaultProductPrice</requiredEntity>
+    </entity>
+    <entity name="scopeGlobal" type="scope">
+        <data key="value">0</data>
+    </entity>
+    <entity name="defaultProductPrice" type="default_product_price">
+        <data key="value"/>
+    </entity>
+
+</entities>

app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_price-meta.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+    <operation name="CatalogPriceConfigState" dataType="catalog_price_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/catalog/" method="POST">
+        <object key="groups" dataType="catalog_price_config_state">
+            <object key="price" dataType="catalog_price_config_state">
+                <object key="fields" dataType="catalog_price_config_state">
+                    <object key="scope" dataType="scope">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="default_product_price" dataType="default_product_price">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>

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

@@ -52,8 +52,7 @@
             <argument name="customStore" value="customStoreView"/>
         </actionGroup>
         <!--Set Configuration-->
-        <actionGroup ref="CatalogPriceConfigurations" stepKey="SetCatalogConfigurations"/>
-
+        <createData entity="CatalogPriceScopeWebsite" stepKey="paymentMethodsSettingConfig"/>
         <!--Set advanced pricing for all 4 products-->
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct1">
             <argument name="product" value="$$product1$$"/>
@@ -310,9 +309,7 @@
             <deleteData createDataKey="product4" stepKey="deleteProduct4"/>
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
-            <actionGroup ref="CatalogPriceConfigurations" stepKey="SetCatalogConfigurations">
-                <argument name="website" value="Global"/>
-            </actionGroup>
+            <createData entity="DefaultConfigCatalogPrice" stepKey="defaultConfigCatalogPrice"/>
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="DeleteWebsite">
                 <argument name="websiteName" value="secondWebsite"/>
             </actionGroup>