Merge remote-tracking branch 'origin/MAGETWO-60875' into 2.3-develop-pr40

Author: zakdma

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php

@@ -10,7 +10,6 @@
 use Magento\Mtf\Client\Locator;
 
 /**
- * Class Search
  * Block for "Search" section
  */
 class Search extends Block
@@ -158,4 +157,24 @@ public function clickSuggestedText($text)
         $searchAutocomplete = sprintf($this->searchAutocomplete, $text);
         $this->_rootElement->find($searchAutocomplete, Locator::SELECTOR_XPATH)->click();
     }
+
+    /**
+     * Wait for element is enabled.
+     *
+     * @param string $selector
+     * @param string $strategy
+     * @return bool|null
+     */
+    public function waitForElementEnabled($selector, $strategy = Locator::SELECTOR_CSS)
+    {
+        $browser = $this->browser;
+
+        return $browser->waitUntil(
+            function () use ($browser, $selector, $strategy) {
+                $element = $browser->find($selector, $strategy);
+
+                return !$element->isDisabled() ? true : null;
+            }
+        );
+    }
 }

dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.php

@@ -28,6 +28,13 @@ class PromoQuoteForm extends FormSections
      */
     protected $waitForSelectorVisible = false;
 
+    /**
+     * Selector of name element on the form.
+     *
+     * @var string
+     */
+    private $nameElementSelector = 'input[name=name]';
+
     /**
      * Fill form with sections.
      *
@@ -38,6 +45,8 @@ class PromoQuoteForm extends FormSections
      */
     public function fill(FixtureInterface $fixture, SimpleElement $element = null, array $replace = null)
     {
+        $this->waitForElementNotVisible($this->waitForSelector);
+        $this->waitForElementVisible($this->nameElementSelector);
         $sections = $this->getFixtureFieldsByContainers($fixture);
         if ($replace) {
             $sections = $this->prepareData($sections, $replace);