MTA-2145: Sync qmt repository with mainline - Sprint 12

Author: Dmytro Aponasenko

dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php

@@ -172,14 +172,14 @@ abstract class Grid extends Block
      *
      * @var string
      */
-    protected $actionNextPage = '.pager .action-next';
+    protected $actionNextPage = '[class*=data-grid-pager] .action-next';
 
     /**
      * Locator for disabled next page action
      *
      * @var string
      */
-    protected $actionNextPageDisabled = '.pager .action-next.disabled';
+    protected $actionNextPageDisabled = '[class*=data-grid-pager] .action-next.disabled';
 
     /**
      * First row selector
@@ -188,6 +188,13 @@ abstract class Grid extends Block
      */
     protected $firstRowSelector = '';
 
+    /**
+     * Selector for no records row.
+     *
+     * @var string
+     */
+    protected $noRecords = '[data-role="row"] .empty-text';
+
     /**
      * Get backend abstract block
      *
@@ -328,6 +335,9 @@ public function resetFilter()
      */
     public function massaction(array $items, $action, $acceptAlert = false, $massActionSelection = '')
     {
+        if ($this->_rootElement->find($this->noRecords)->isVisible()) {
+            return;
+        }
         if (!is_array($action)) {
             $action = [$action => '-'];
         }

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAssignedToTemplateProductAttributeTest.php

@@ -12,18 +12,16 @@
 use Magento\Mtf\TestCase\Injectable;
 
 /**
- * Test Creation for Delete Attribute Set (Product Template)
- *
  * Preconditions:
- * 1. Create Product template, based on Default
- * 2. Create product attribute and add to created template
+ * 1. Create Product template, based on Default.
+ * 2. Create product attribute and add to created template.
  *
  * Test Flow:
  * 1. Log in to Backend.
- * 2. Go to Stores > Attributes > Product
- * 3. Search product attribute in grid by given data
- * 4. Open this attribute by clicking
- * 5. Click on the "Delete Attribute" button
+ * 2. Go to Stores > Attributes > Product.
+ * 3. Search product attribute in grid by given data.
+ * 4. Open this attribute by clicking.
+ * 5. Click on the "Delete Attribute" button.
  * 6. Perform all assertions.
  *
  * @group Product_Attributes_(MX)
@@ -37,21 +35,21 @@ class DeleteAssignedToTemplateProductAttributeTest extends Injectable
     /* end tags */
 
     /**
-     * Catalog Product Attribute index page
+     * Catalog Product Attribute index page.
      *
      * @var CatalogProductAttributeIndex
      */
     protected $attributeIndex;
 
     /**
-     * Catalog Product Attribute new page
+     * Catalog Product Attribute new page.
      *
      * @var CatalogProductAttributeNew
      */
     protected $attributeNew;
 
     /**
-     * Inject pages
+     * Inject pages.
      *
      * @param CatalogProductAttributeIndex $attributeIndex
      * @param CatalogProductAttributeNew $attributeNew
@@ -64,7 +62,7 @@ public function __inject(CatalogProductAttributeIndex $attributeIndex, CatalogPr
     }
 
     /**
-     * Run DeleteAssignedToTemplateProductAttribute test
+     * Run test.
      *
      * @param CatalogAttributeSet $productTemplate
      * @return array
@@ -73,19 +71,14 @@ public function test(CatalogAttributeSet $productTemplate)
     {
         // Precondition
         $productTemplate->persist();
+        $attribute = $productTemplate->getDataFieldConfig('assigned_attributes')['source']->getAttributes()[0];
 
         // Steps
-        $filter = [
-            'attribute_code' => $productTemplate
-                ->getDataFieldConfig('assigned_attributes')['source']
-                ->getAttributes()[0]
-                ->getAttributeCode(),
-        ];
-
+        $filter = ['attribute_code' => $attribute->getAttributeCode()];
         $this->attributeIndex->open();
         $this->attributeIndex->getGrid()->searchAndOpen($filter);
         $this->attributeNew->getPageActions()->delete();
 
-        return ['productTemplate' => $productTemplate];
+        return ['productTemplate' => $productTemplate, 'attribute' => $attribute];
     }
 }

dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php

@@ -43,7 +43,7 @@ class AssociatedProducts extends Tab
      *
      * @var string
      */
-    protected $deleteButton = '.delete';
+    protected $deleteButton = '[data-role="delete"]';
 
     /**
      * Get search grid

dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Grid.php

@@ -37,7 +37,7 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
      *
      * @var string
      */
-    protected $action = '.action-select';
+    protected $action = '.col-actions [class*="control-select"]';
 
     /**
      * Action for newsletter template

dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Rating/Grid.php

@@ -28,10 +28,10 @@ class Grid extends AbstractGrid
      */
     protected $filters = [
         'rating_code' => [
-            'selector' => '.filter [name="rating_code"]',
+            'selector' => '[name="rating_code"]',
         ],
         'is_active' => [
-            'selector' => '.filter [name="is_active"]',
+            'selector' => '[name="is_active"]',
             'input' => 'select',
         ],
     ];