Merge remote-tracking branch 'origin/MAGETWO-96250' into 2.3-develop-mftf-pr9

Author: Stas Puga

app/code/Magento/GiftMessage/Test/Mftf/Data/GiftOptionsData.xml

@@ -7,23 +7,21 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <entity name="allowGiftReceipt" type="allow_gift_receipt">
-        <data key="value">0</data>
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="EnableGiftMessageForOrder" type="gift_message_config_state">
+        <requiredEntity type="allow_order">AllowGiftMessageForOrder</requiredEntity>
     </entity>
-    <entity name="allowPrintedCard" type="allow_printed_card">
-        <data key="value">0</data>
+    <entity name="AllowGiftMessageForOrder" type="allow_order">
+        <data key="value">1</data>
     </entity>
-
-    <entity name="DefaultConfigGiftOptions" type="gift_options_config_state">
-        <requiredEntity type="wrapping_allow_order">defaultWrappingAllowOrder</requiredEntity>
-        <requiredEntity type="allow_gift_receipt">defaultAllowGiftReceipt</requiredEntity>
-        <requiredEntity type="allow_printed_card">defaultAllowPrintedCard</requiredEntity>
+    <entity name="DefaultConfigGiftMessageOptions" type="gift_message_config_state">
+        <requiredEntity type="allow_order">OrderDefault</requiredEntity>
+        <requiredEntity type="allow_items">ItemsDefault</requiredEntity>
     </entity>
-    <entity name="defaultAllowGiftReceipt" type="allow_gift_receipt">
-        <data key="value">1</data>
+    <entity name="OrderDefault" type="allow_order">
+        <data key="value">0</data>
     </entity>
-    <entity name="defaultAllowPrintedCard" type="allow_printed_card">
-        <data key="value">1</data>
+    <entity name="ItemsDefault" type="allow_items">
+        <data key="value">0</data>
     </entity>
 </entities>

app/code/Magento/GiftMessage/Test/Mftf/Metadata/gift_options-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="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="SalesGiftMessageConfigState" dataType="gift_message_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/sales/" method="POST" successRegex="/messages-message-success/">
+        <object key="groups" dataType="gift_message_config_state">
+            <object key="gift_options" dataType="gift_message_config_state">
+                <object key="fields" dataType="gift_message_config_state">
+                    <object key="allow_order" dataType="allow_order">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="allow_items" dataType="allow_items">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>