MTA-3285: Extend simple product search

Author: VasylKozyrenko

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

@@ -55,14 +55,14 @@ class Search extends Block
      *
      * @var string
      */
-    protected $searchListItems = './/div[@id="search_autocomplete"]//li';
+    private $searchListItems = './/div[@id="search_autocomplete"]//li';
 
     /**
      * Locator value for body with aria-busy attribute.
      *
      * @var string
      */
-    protected $selectorAriaBusy = './/body[@aria-busy="false"]';
+    private $selectorAriaBusy = './/body[@aria-busy="false"]';
 
     /**
      * Perform search by a keyword.
@@ -87,16 +87,25 @@ public function search($keyword)
     public function fillSearch($text)
     {
         $this->_rootElement->find($this->searchInput)->setValue($text);
-        $searchListItems = $this->searchListItems;
-        $selectorAriaBusy = $this->selectorAriaBusy;
-        $browser = $this->browser;
-        $browser->waitUntil(
-            function () use ($searchListItems, $browser, $selectorAriaBusy) {
-                $count = count($this->_rootElement->getElements($searchListItems, Locator::SELECTOR_XPATH));
+        $this->waitUntilSearchPrepared();
+    }
+
+    /**
+     * Wait until "Suggest Search" block will be prepared.
+     *
+     * @return bool
+     */
+    public function waitUntilSearchPrepared()
+    {
+        $this->browser->waitUntil(
+            function () {
+                $count = count($this->_rootElement->getElements($this->searchListItems, Locator::SELECTOR_XPATH));
                 sleep(0.2);
-                return $browser->find($selectorAriaBusy, Locator::SELECTOR_XPATH)->isVisible() &&
-                    count($this->_rootElement->getElements($searchListItems, Locator::SELECTOR_XPATH)) == $count
-                    ? true : null;
+                $newCount = count($this->_rootElement->getElements($this->searchListItems, Locator::SELECTOR_XPATH));
+                return $this->browser->find($this->selectorAriaBusy, Locator::SELECTOR_XPATH)->isVisible()
+                    && ($newCount == $count)
+                    ? true
+                    : null;
             }
         );
     }
@@ -144,7 +153,6 @@ function () use ($rootElement, $searchAutocomplete) {
     public function clickSuggestedText($text)
     {
         $searchAutocomplete = sprintf($this->searchAutocomplete, $text);
-        $this->waitForElementVisible($searchAutocomplete, Locator::SELECTOR_XPATH);
         $this->_rootElement->find($searchAutocomplete, Locator::SELECTOR_XPATH)->click();
     }
 }