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

Author: Dmytro Aponasenko

dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/DeleteAttributeStep.php

@@ -60,8 +60,11 @@ public function __construct(
      */
     public function run()
     {
-        $filter = ['attribute_code' => $this->attribute->getAttributeCode()];
-        if ($this->catalogProductAttributeIndex->open()->getGrid()->isRowVisible($filter)) {
+        $filter = $this->attribute->hasData('attribute_code')
+            ? ['attribute_code' => $this->attribute->getAttributeCode()]
+            : ['frontend_label' => $this->attribute->getFrontendLabel()];
+        $this->catalogProductAttributeIndex->open();
+        if ($this->catalogProductAttributeIndex->getGrid()->isRowVisible($filter)) {
             $this->catalogProductAttributeIndex->getGrid()->searchAndOpen($filter);
             $this->catalogProductAttributeNew->getPageActions()->delete();
         }

dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveAttributeStep.php

@@ -7,7 +7,9 @@
 namespace Magento\Catalog\Test\TestStep;
 
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew;
+use Magento\Mtf\ObjectManager;
 use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 
 /**
  * Save attribute on attribute page.
@@ -22,21 +24,33 @@ class SaveAttributeStep implements TestStepInterface
     protected $attributeNew;
 
     /**
-     * Delete attribute step.
+     * Product attribute fixture.
      *
-     * @var DeleteAttributeStep
+     * @var CatalogProductAttribute
      */
-    protected $deleteAttribute;
+    protected $attribute;
+
+    /**
+     * Object manager instance.
+     *
+     * @var ObjectManager
+     */
+    protected $objectManager;
 
     /**
      * @constructor
      * @param CatalogProductAttributeNew $attributeNew
-     * @param DeleteAttributeStep $deleteAttribute
+     * @param CatalogProductAttribute $attribute
+     * @param ObjectManager $objectManager
      */
-    public function __construct(CatalogProductAttributeNew $attributeNew, DeleteAttributeStep $deleteAttribute)
-    {
+    public function __construct(
+        CatalogProductAttributeNew $attributeNew,
+        CatalogProductAttribute $attribute,
+        ObjectManager $objectManager
+    ) {
         $this->attributeNew = $attributeNew;
-        $this->deleteAttribute = $deleteAttribute;
+        $this->attribute = $attribute;
+        $this->objectManager = $objectManager;
     }
 
     /**
@@ -56,6 +70,9 @@ public function run()
      */
     public function cleanup()
     {
-        $this->deleteAttribute->run();
+        $this->objectManager->create(
+            'Magento\Catalog\Test\TestStep\DeleteAttributeStep',
+            ['attribute' => $this->attribute]
+        );
     }
 }

dev/tests/functional/tests/app/Magento/Widget/Test/Block/Adminhtml/Widget/WidgetGrid.php

@@ -25,7 +25,7 @@ class WidgetGrid extends AbstractGrid
      *
      * @var string
      */
-    protected $firstRowSelector = '//tr[./td[contains(@class, "col-title")]][1]/td';
+    protected $firstRowSelector = '//tbody//tr[@data-role="row"]/td[contains(@class, "col-title")][1]';
 
     /**
      * Filters array mapping.