MTA-2657: Sync qmt repository with mainline - Sprint 20

- Fixed errors

Author: Oleksandr Manchenko

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php

@@ -27,7 +27,7 @@ class Price extends \Magento\Catalog\Test\Block\AbstractPriceBlock
             'selector' => '.special-price .price',
         ],
         'old_price' => [
-            'selector' => '.old-price .price',
+            'selector' => '.old-price .price-wrapper ',
         ],
         'price_from' => [
             'selector' => '.price-from .price',

dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Customer.xml

@@ -118,6 +118,14 @@
             </field>
         </dataset>
 
+        <dataset name="register_customer">
+            <field name="firstname" xsi:type="string">John</field>
+            <field name="lastname" xsi:type="string">Doe</field>
+            <field name="email" xsi:type="string">JohnDoe_%isolation%@example.com</field>
+            <field name="password" xsi:type="string">123123q</field>
+            <field name="password_confirmation" xsi:type="string">123123q</field>
+        </dataset>
+
         <dataset name="backend_customer">
             <field name="firstname" xsi:type="string">John</field>
             <field name="lastname" xsi:type="string">Doe%isolation%</field>

dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleForm.php

@@ -26,7 +26,7 @@ class AssertCartPriceRuleForm extends AbstractConstraint
         'actions_serialized',
         'from_date',
         'to_date',
-        'id'
+        'rule_id'
     ];
 
     /**

dev/tests/functional/tests/app/Magento/SalesRule/Test/Fixture/SalesRule.xml

@@ -14,7 +14,7 @@
              repository_class="Magento\SalesRule\Test\Repository\SalesRule"
              handler_interface="Magento\SalesRule\Test\Handler\SalesRule\SalesRuleInterface"
              class="Magento\SalesRule\Test\Fixture\SalesRule">
-        <field name="rule_id" is_required="1" />
+        <field name="rule_id" is_required="0" group="null"/>
         <field name="name" group="rule_information" />
         <field name="description" group="rule_information" />
         <field name="from_date" group="rule_information" source="Magento\Backend\Test\Fixture\Source\Date" />
@@ -38,7 +38,6 @@
         <field name="use_auto_generation" group="rule_information" />
         <field name="uses_per_coupon" group="rule_information" />
         <field name="simple_free_shipping" group="actions" />
-        <field name="id" />
         <field name="website_ids" group="rule_information" />
         <field name="customer_group_ids" group="rule_information" />
         <field name="store_labels" group="labels" />

dev/tests/functional/tests/app/Magento/SalesRule/Test/Handler/SalesRule/Curl.php

@@ -154,7 +154,7 @@ public function persist(FixtureInterface $fixture = null)
             throw new \Exception('Cannot find Sales Rule id');
         }
 
-        return ['id' => $matches[1]];
+        return ['rule_id' => $matches[1]];
     }
 
     /**

dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php

@@ -88,11 +88,11 @@ class DataGrid extends Grid
     protected $actionButton = '.modal-inner-wrap .action-secondary';
 
     /**
-     * Column header locator
+     * Column header locator.
      *
      * @var string
      */
-    protected $columnHeader = "//th/span[.='%s']";
+    protected $columnHeader = './/*[@data-role="grid-wrapper"]//th/span[.="%s"]';
 
     /**
      * @var string