Merge branch 'MTA-3285' of github.com:magento-qmt/magento2ce into MTA-3333

Author: SmolyarO

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

@@ -50,6 +50,20 @@ class Search extends Block
      */
     protected $placeholder = '//input[@id="search" and contains(@placeholder, "%s")]';
 
+    /**
+     * Locator value for list items.
+     *
+     * @var string
+     */
+    private $searchListItems = './/div[@id="search_autocomplete"]//li';
+
+    /**
+     * Locator value for body with aria-busy attribute.
+     *
+     * @var string
+     */
+    private $selectorAriaBusy = './/body[@aria-busy="false"]';
+
     /**
      * Perform search by a keyword.
      *
@@ -73,6 +87,27 @@ public function search($keyword)
     public function fillSearch($text)
     {
         $this->_rootElement->find($this->searchInput)->setValue($text);
+        $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);
+                $newCount = count($this->_rootElement->getElements($this->searchListItems, Locator::SELECTOR_XPATH));
+                return $this->browser->find($this->selectorAriaBusy, Locator::SELECTOR_XPATH)->isVisible()
+                    && ($newCount == $count)
+                    ? true
+                    : null;
+            }
+        );
     }
 
     /**
@@ -108,4 +143,16 @@ function () use ($rootElement, $searchAutocomplete) {
             }
         );
     }
+
+    /**
+     * Click on suggested text.
+     *
+     * @param string $text
+     * @return void
+     */
+    public function clickSuggestedText($text)
+    {
+        $searchAutocomplete = sprintf($this->searchAutocomplete, $text);
+        $this->_rootElement->find($searchAutocomplete, Locator::SELECTOR_XPATH)->click();
+    }
 }

dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSuggestSearchingResult.php

@@ -9,6 +9,7 @@
 use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
 use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\CatalogSearch\Test\Page\AdvancedResult;
 
 /**
  * Class AssertSuggestSearchingResult
@@ -18,13 +19,20 @@ class AssertSuggestSearchingResult extends AbstractConstraint
     /**
      * Check that after input some text(e.g. product name) into search field, drop-down window is appeared.
      * Window contains requested entity and number of quantity.
+     * Click on search suggestion and verify that search is performed.
      *
      * @param CmsIndex $cmsIndex
      * @param CatalogSearchQuery $catalogSearch
+     * @param AssertCatalogSearchResult $assertCatalogSearchResult
+     * @param AdvancedResult $resultPage
      * @return void
      */
-    public function processAssert(CmsIndex $cmsIndex, CatalogSearchQuery $catalogSearch)
-    {
+    public function processAssert(
+        CatalogSearchQuery $catalogSearch,
+        CmsIndex $cmsIndex,
+        AssertCatalogSearchResult $assertCatalogSearchResult,
+        AdvancedResult $resultPage
+    ) {
         $cmsIndex->open();
         $searchBlock = $cmsIndex->getSearchBlock();
 
@@ -41,6 +49,8 @@ public function processAssert(CmsIndex $cmsIndex, CatalogSearchQuery $catalogSea
             $isVisible,
             'Block "Suggest Search" when searching was not found'
         );
+        $searchBlock->clickSuggestedText($queryText);
+        $assertCatalogSearchResult->processAssert($catalogSearch, $resultPage);
     }
 
     /**
@@ -50,6 +60,6 @@ public function processAssert(CmsIndex $cmsIndex, CatalogSearchQuery $catalogSea
      */
     public function toString()
     {
-        return 'Asserts window contains requested entity and quantity';
+        return 'Asserts window contains requested entity and quantity. Searched product has been successfully found.';
     }
 }

dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml

@@ -6,7 +6,7 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-    <testCase name="Magento\CatalogSearch\Test\TestCase\SearchEntityResultsTest" summary="Use Simple Product Search" ticketId="MAGETWO-25095">
+    <testCase name="Magento\CatalogSearch\Test\TestCase\SearchEntityResultsTest" summary="Use Quick Search to Find Product" ticketId="MAGETWO-25095">
         <variation name="SearchEntityResultsTestVariation1" summary="Use Quick Search to Find the Product" ticketId="MAGETWO-12420">
             <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
             <data name="catalogSearch/data/query_text/value" xsi:type="string">catalogProductSimple::default::sku</data>