MAGETWO-36622: [UI] Merge grid styles

- fixed tests

Author: Dmytro Vilchynskyi

dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/CurrencySymbolForm.php

@@ -22,7 +22,7 @@ class CurrencySymbolForm extends Form
      *
      * @var string
      */
-    protected $currencyRow = '//tr[td/label[@for="custom_currency_symbol%s"]]';
+    protected $currencyRow = '//div[input[@id="custom_currency_symbol%s"]]';
 
     /**
      * Fill the root form

dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/Bestsellers.xml

@@ -10,6 +10,6 @@
     <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages .messages" strategy="css selector"/>
     <block name="actionsBlock" class="Magento\Reports\Test\Block\Adminhtml\Viewed\Action" locator=".page-main-actions" strategy="css selector"/>
     <block name="filterBlock" class="Magento\Reports\Test\Block\Adminhtml\Product\Viewed\Filter" locator="#filter_form" strategy="css selector"/>
-    <block name="gridBlock" class="Magento\Reports\Test\Block\Adminhtml\Product\Viewed\ProductGrid" locator=".admin__data-grid-wrap" strategy="css selector"/>
+    <block name="gridBlock" class="Magento\Reports\Test\Block\Adminhtml\Product\Viewed\ProductGrid" locator=".data-grid" strategy="css selector"/>
   </page>
 </config>

dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ProductReportView.xml

@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
   <page name="ProductReportView" area="Adminhtml" mca="reports/report_product/viewed/" module="Magento_Reports">
     <block name="actionsBlock" class="Magento\Reports\Test\Block\Adminhtml\Viewed\Action" locator=".page-main-actions" strategy="css selector"/>
-    <block name="gridBlock" class="Magento\Reports\Test\Block\Adminhtml\Review\Products\Viewed\ProductGrid" locator=".admin__data-grid-wrap" strategy="css selector"/>
+    <block name="gridBlock" class="Magento\Reports\Test\Block\Adminhtml\Review\Products\Viewed\ProductGrid" locator=".data-grid" strategy="css selector"/>
     <block name="filterBlock" class="Magento\Sales\Test\Block\Adminhtml\Report\Filter\Form" locator="#filter_form" strategy="css selector"/>
     <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages .messages" strategy="css selector"/>
   </page>

dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/RefundsReport.xml

@@ -10,6 +10,6 @@
     <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages .messages" strategy="css selector"/>
     <block name="filterBlock" class="Magento\Sales\Test\Block\Adminhtml\Report\Filter\Form" locator="#filter_form" strategy="css selector"/>
     <block name="actionBlock" class="Magento\Reports\Test\Block\Adminhtml\Viewed\Action" locator=".page-main-actions" strategy="css selector"/>
-    <block name="gridBlock" class="Magento\Reports\Test\Block\Adminhtml\Sales\Refunded\FilterGrid" locator=".admin__data-grid-wrap" strategy="css selector"/>
+    <block name="gridBlock" class="Magento\Reports\Test\Block\Adminhtml\Sales\Refunded\FilterGrid" locator=".data-grid" strategy="css selector"/>
   </page>
 </config>

dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesInvoiceReport.xml

@@ -10,6 +10,6 @@
     <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages .messages" strategy="css selector"/>
     <block name="filterForm" class="Magento\Sales\Test\Block\Adminhtml\Report\Filter\Form" locator="#filter_form" strategy="css selector"/>
     <block name="actionBlock" class="Magento\Reports\Test\Block\Adminhtml\Viewed\Action" locator=".page-main-actions" strategy="css selector"/>
-    <block name="gridBlock" class="Magento\Reports\Test\Block\Adminhtml\Sales\Invoiced\Grid" locator=".admin__data-grid-wrap" strategy="css selector"/>
+    <block name="gridBlock" class="Magento\Reports\Test\Block\Adminhtml\Sales\Invoiced\Grid" locator=".data-grid" strategy="css selector"/>
   </page>
 </config>

dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesReport.xml

@@ -10,6 +10,6 @@
     <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages .messages" strategy="css selector"/>
     <block name="filterBlock" class="Magento\Sales\Test\Block\Adminhtml\Report\Filter\Form" locator="#filter_form" strategy="css selector"/>
     <block name="actionBlock" class="Magento\Reports\Test\Block\Adminhtml\Viewed\Action" locator=".page-main-actions" strategy="css selector"/>
-    <block name="gridBlock" class="Magento\Reports\Test\Block\Adminhtml\Sales\Orders\Viewed\FilterGrid" locator=".admin__data-grid-wrap" strategy="css selector"/>
+    <block name="gridBlock" class="Magento\Reports\Test\Block\Adminhtml\Sales\Orders\Viewed\FilterGrid" locator=".data-grid" strategy="css selector"/>
   </page>
 </config>

dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesTaxReport.xml

@@ -9,6 +9,6 @@
   <page name="SalesTaxReport" area="Adminhtml" mca="reports/report_sales/tax" module="Magento_Reports">
     <block name="filterBlock" class="Magento\Reports\Test\Block\Adminhtml\Sales\TaxRule\Filter" locator="#filter_form" strategy="css selector"/>
     <block name="actionBlock" class="Magento\Reports\Test\Block\Adminhtml\Sales\TaxRule\Action" locator=".page-main-actions" strategy="css selector"/>
-    <block name="gridBlock" class="Magento\Reports\Test\Block\Adminhtml\Sales\TaxRule\Grid" locator=".admin__data-grid-wrap" strategy="css selector"/>
+    <block name="gridBlock" class="Magento\Reports\Test\Block\Adminhtml\Sales\TaxRule\Grid" locator=".data-grid" strategy="css selector"/>
   </page>
 </config>