MTA-2311: CMS module functional tests maintenance

Author: Vitaliy Honcharenko

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

@@ -104,13 +104,6 @@ abstract class Grid extends Block
      */
     protected $templateBlock = './ancestor::body';
 
-    /**
-     * Selector of element to wait for. If set by child will wait for element after action
-     *
-     * @var string
-     */
-    protected $waitForSelector;
-
     /**
      * Locator type of waitForSelector
      *
@@ -249,7 +242,6 @@ public function searchAndOpen(array $filter)
         $rowItem = $this->_rootElement->find($this->rowItem, Locator::SELECTOR_CSS);
         if ($rowItem->isVisible()) {
             $rowItem->find($this->editLink, Locator::SELECTOR_CSS)->click();
-            $this->waitForElement();
         } else {
             throw new \Exception('Searched item was not found.');
         }
@@ -273,20 +265,6 @@ function () use ($browser, $selector) {
         $this->getTemplateBlock()->waitLoader();
     }
 
-    /**
-     * Method that waits for the configured selector using class attributes.
-     */
-    protected function waitForElement()
-    {
-        if (!empty($this->waitForSelector)) {
-            if ($this->waitForSelectorVisible) {
-                $this->getTemplateBlock()->waitForElementVisible($this->waitForSelector, $this->waitForSelectorType);
-            } else {
-                $this->getTemplateBlock()->waitForElementNotVisible($this->waitForSelector, $this->waitForSelectorType);
-            }
-        }
-    }
-
     /**
      * Search for item and select it
      *

dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Grid.php

@@ -81,9 +81,29 @@ public function searchAndPreview(array $filter)
         $rowItem = $this->_rootElement->find($this->rowItem);
         if ($rowItem->isVisible()) {
             $rowItem->find($this->previewCmsPage)->click();
-            $this->waitForElement();
         } else {
             throw new \Exception('Searched item was not found.');
         }
     }
+
+    /**
+     * Wait loader.
+     *
+     * @return void
+     */
+    protected function waitLoader()
+    {
+        try {
+            $browser = $this->browser;
+            $selector = $this->loader;
+            $browser->waitUntil(
+                function () use ($browser, $selector) {
+                    return $browser->find($selector)->isVisible() == true ? true : null;
+                }
+            );
+        } catch (\Exception $e) {
+        }
+
+        parent::waitLoader();
+    }
 }

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

@@ -117,7 +117,6 @@ public function searchAndOpen(array $filter)
         $rowItem = $this->getRow($filter);
         if ($rowItem->isVisible()) {
             $rowItem->find($this->editLink)->click();
-            $this->waitForElement();
         } else {
             throw new \Exception('Searched item was not found.');
         }