MAGETWO-54456: Random FAT test fails CatalogRuleStaging_Create_ForNewCustomerGroup_ApplyAsPercentage

Author: serhii-balko

dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/PromoForm.php

@@ -6,22 +6,24 @@
 
 namespace Magento\CatalogRule\Test\Block\Adminhtml\Promo\Catalog\Edit;
 
-use \Magento\Ui\Test\Block\Adminhtml\FormSections;
-use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Backend\Test\Block\Template;
+use Magento\Mtf\Client\Locator;
 use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Ui\Test\Block\Adminhtml\FormSections;
 
 /**
  * Form for creation of a Catalog Price Rule.
  */
 class PromoForm extends FormSections
 {
     /**
-     * Magento form loader.
+     * Selector for template block.
      *
      * @var string
      */
-    protected $spinner = '[data-role="spinner"]';
-    
+    private $templateBlockSelector = './ancestor::body';
+
     /**
      * Fill form with tabs.
      *
@@ -72,6 +74,19 @@ protected function prepareData(array $tabs, array $replace)
     protected function waitPageToLoad()
     {
         $this->waitForElementVisible($this->header);
-        $this->waitForElementNotVisible($this->spinner);
+        $this->getTemplateBlock()->waitLoader();
+    }
+
+    /**
+     * Get template block.
+     *
+     * @return Template
+     */
+    protected function getTemplateBlock()
+    {
+        return $this->blockFactory->create(
+            Template::class,
+            ['element' => $this->_rootElement->find($this->templateBlockSelector, Locator::SELECTOR_XPATH)]
+        );
     }
 }