Merge branch 'MTA-2319' of https://github.corp.ebay.com/magento-qmt/magento2ce into develop

Author: Dmytro Aponasenko

dev/tests/functional/lib/Magento/Mtf/Client/Element/GlobalsearchElement.php

@@ -14,11 +14,6 @@
  */
 class GlobalsearchElement extends SimpleElement
 {
-    /**
-     * "Backspace" key code.
-     */
-    const BACKSPACE = "\xEE\x80\x83";
-
     /**
      * Search icon selector.
      *
@@ -63,43 +58,14 @@ class GlobalsearchElement extends SimpleElement
     public function setValue($value)
     {
         $this->eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
-
         $this->waitInitElement();
-
         if (!$this->find($this->searchInput)->isVisible()) {
             $this->find($this->searchIcon)->click();
         }
-        $this->selectWindow();
-        $this->clear();
-        $this->find($this->searchInput)->setValue($value);
-        $this->selectWindow();
-
+        $this->find($this->searchInput)->keys(str_split($value));
         $this->waitResult();
     }
 
-    /**
-     * Clear value of element.
-     *
-     * @return void
-     */
-    protected function clear()
-    {
-        $element = $this->find($this->searchInput);
-        while ('' != $element->getValue()) {
-            $element->setValue([self::BACKSPACE]);
-        }
-    }
-
-    /**
-     * Select to last window.
-     *
-     * @return void
-     */
-    protected function selectWindow()
-    {
-        $this->driver->selectWindow();
-    }
-
     /**
      * Wait init search suggest container.
      *
@@ -130,12 +96,7 @@ public function waitResult()
 
         $this->driver->waitUntil(
             function () use ($browser, $selector) {
-                if ($browser->find($selector)->isVisible()) {
-                    return true;
-                } else {
-                    $browser->selectWindow();
-                    return null;
-                }
+                return $browser->find($selector)->isVisible() ? true : null;
             }
         );
     }

dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/GlobalSearchEntityTest.php

@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Backend\Test\TestCase;
+
+use Magento\Backend\Test\Fixture\GlobalSearch;
+use Magento\Backend\Test\Page\Adminhtml\Dashboard;
+use Magento\Mtf\TestCase\Injectable;
+
+/**
+ * Preconditions:
+ * 1. Create customer
+ * 2. Create two simple products
+ * 3. Create order with one of created simple product
+ *
+ * Steps:
+ * 1. Login to backend
+ * 2. Click on Search button on the top of page
+ * 3. Fill in data according dataSet
+ * 4. Perform assertions
+ *
+ * @group Search_Core_(MX)
+ * @ZephyrId MAGETWO-28457
+ */
+class GlobalSearchEntityTest extends Injectable
+{
+    /* tags */
+    const MVP = 'no';
+    const DOMAIN = 'MX';
+    /* end tags */
+
+    /**
+     * Backend Dashboard page.
+     *
+     * @var Dashboard
+     */
+    protected $dashboard;
+
+    /**
+     * Preparing pages for test.
+     *
+     * @param Dashboard $dashboard
+     * @return void
+     */
+    public function __inject(Dashboard $dashboard)
+    {
+        $this->dashboard = $dashboard;
+    }
+
+    /**
+     * Run Global Search Entity Test.
+     *
+     * @param GlobalSearch $search
+     * @return void
+     */
+    public function test(GlobalSearch $search)
+    {
+        //Steps:
+        $this->dashboard->open();
+        $this->dashboard->getAdminPanelHeader()->search($search->getQuery());
+    }
+}

dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/GlobalSearchEntityTest.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Backend\Test\TestCase\GlobalSearchEntityTest">
+        <variation name="GlobalSearchEntityTestVariation2">
+            <data name="description" xsi:type="string">search with 2 sign return no results</data>
+            <data name="search/data/query" xsi:type="string">:)</data>
+            <constraint name="Magento\Backend\Test\Constraint\AssertGlobalSearchNoRecordsFound" />
+        </variation>
+        <variation name="GlobalSearchEntityTestVariation3">
+            <data name="description" xsi:type="string">search product by sku</data>
+            <data name="search/data/query" xsi:type="string">orderInjectable::default::product::sku</data>
+            <constraint name="Magento\Backend\Test\Constraint\AssertGlobalSearchProductName" />
+        </variation>
+        <variation name="GlobalSearchEntityTestVariation4">
+            <data name="description" xsi:type="string">search existed customer</data>
+            <data name="search/data/query" xsi:type="string">customer::johndoe_unique::lastname</data>
+            <constraint name="Magento\Backend\Test\Constraint\AssertGlobalSearchCustomerName" />
+        </variation>
+        <variation name="GlobalSearchEntityTestVariation5">
+            <data name="description" xsi:type="string">search order (by order id)</data>
+            <data name="search/data/query" xsi:type="string">orderInjectable::default::id</data>
+            <constraint name="Magento\Backend\Test\Constraint\AssertGlobalSearchOrderId" />
+        </variation>
+    </testCase>
+</config>

dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/NavigateMenuTest.php

@@ -13,7 +13,7 @@
  * Steps:
  * 1. Log in to backend.
  * 2. Navigate throught menu to the page.
- * 6. Perform asserts.
+ * 3. Perform asserts.
  *
  * @ZephyrId MAGETWO-34874
  */