MAGETWO-34305: Support pull requests until merged

Author: sivaschenko

dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/EditCurrencySymbolEntityTest.xml

@@ -12,9 +12,9 @@
       <data name="currencySymbol/data/code" xsi:type="string">UAH</data>
       <data name="currencySymbol/data/inherit_custom_currency_symbol" xsi:type="string">No</data>
       <data name="currencySymbol/data/custom_currency_symbol" xsi:type="string">custom</data>
-      <constraint name="Magento\CurrencySymbol\Test\Constraint\AssertCurrencySymbolSuccessSaveMessage" next="Magento\CurrencySymbol\Test\Constraint\AssertCurrencySymbolOnProductPage"/>
-      <constraint name="Magento\CurrencySymbol\Test\Constraint\AssertCurrencySymbolOnProductPage" next="Magento\CurrencySymbol\Test\Constraint\AssertCurrencySymbolOnCatalogPage" prev="Magento\CurrencySymbol\Test\Constraint\AssertCurrencySymbolSuccessSaveMessage"/>
-      <constraint name="Magento\CurrencySymbol\Test\Constraint\AssertCurrencySymbolOnCatalogPage" prev="Magento\CurrencySymbol\Test\Constraint\AssertCurrencySymbolOnProductPage"/>
+      <constraint name="Magento\CurrencySymbol\Test\Constraint\AssertCurrencySymbolSuccessSaveMessage" next="Magento\CurrencySymbol\Test\Constraint\AssertCurrencySymbolOnCatalogPage"/>
+      <constraint name="Magento\CurrencySymbol\Test\Constraint\AssertCurrencySymbolOnCatalogPage" next="Magento\CurrencySymbol\Test\Constraint\AssertCurrencySymbolOnProductPage"/>
+      <constraint name="Magento\CurrencySymbol\Test\Constraint\AssertCurrencySymbolOnProductPage"/>
     </variation>
     <variation name="EditCurrencySymbolEntityTestVariation2" firstConstraint="Magento\CurrencySymbol\Test\Constraint\AssertCurrencySymbolSuccessSaveMessage" method="test">
       <data name="configData" xsi:type="string">config_currency_symbols_usd_and_uah</data>

dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.xml

@@ -14,34 +14,34 @@
         <field name="sender_email" xsi:type="string">SenderName%isolation%@example.com</field>
         <field name="text" xsi:type="string">Some text %isolation%</field>
     </dataset>
-    <field name="template_id" is_required="1">
+    <field name="id" is_required="1">
       <default_value xsi:type="null"/>
     </field>
-    <field name="template_code" is_required="">
+    <field name="code" is_required="">
       <default_value xsi:type="string">TemplateName%isolation%</default_value>
     </field>
-    <field name="template_text" is_required="">
+    <field name="text" is_required="">
       <default_value xsi:type="string">Some text %isolation%</default_value>
     </field>
-    <field name="template_text_preprocessed" is_required="">
+    <field name="text_preprocessed" is_required="">
       <default_value xsi:type="null"/>
     </field>
-    <field name="template_styles" is_required="">
+    <field name="styles" is_required="">
       <default_value xsi:type="null"/>
     </field>
-    <field name="template_type" is_required="">
+    <field name="type" is_required="">
       <default_value xsi:type="null"/>
     </field>
-    <field name="template_subject" is_required="">
+    <field name="subject" is_required="">
       <default_value xsi:type="string">TemplateSubject%isolation%</default_value>
     </field>
-    <field name="template_sender_name" is_required="">
+    <field name="sender_name" is_required="">
       <default_value xsi:type="string">SenderName%isolation%</default_value>
     </field>
-    <field name="template_sender_email" is_required="">
+    <field name="sender_email" is_required="">
       <default_value xsi:type="string">SenderName%isolation%@example.com</default_value>
     </field>
-    <field name="template_actual" is_required="">
+    <field name="actual" is_required="">
       <default_value xsi:type="string">1</default_value>
     </field>
     <field name="added_at" is_required="">

dev/tests/functional/tests/app/Magento/Weee/Test/Repository/ConfigData.xml

@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
-    <repository class="Magento\Core\Test\Repositoy\ConfigData">
+    <repository class="Magento\Core\Test\Repository\ConfigData">
         <dataset name="default_tax_configuration">
             <field path="tax/weee/enable" scope="tax" scope_id="1" label="No" xsi:type="string">0</field>
             <field path="tax/weee/display_list" scope="tax" scope_id="1" label="Including FPT and FPT description" xsi:type="string">1</field>