Merge branch 'UI' of https://github.corp.ebay.com/magento-webdev/magento2ce into UI

Author: Natalia Momotenko

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/AttributeForm.php

@@ -38,7 +38,7 @@ class AttributeForm extends FormTabs
      *
      * @var string
      */
-    protected $pageTitle = '.page-title .title';
+    protected $pageTitle = '.page-title';
 
     /**
      * Get data of the tabs.

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/NewCategoryIds.php

@@ -40,7 +40,7 @@ class NewCategoryIds extends Form
      *
      * @var string
      */
-    protected $createCategoryButton = '.action-create';
+    protected $createCategoryButton = '[data-action="save"]';
 
     /**
      * Add new category to product.

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ListProduct.php

@@ -22,7 +22,7 @@ class ListProduct extends Block
      *
      * @var string
      */
-    protected $productItem = './/*[contains(@class,"product-item-link") and @title="%s"]/ancestor::li';
+    protected $productItem = './/*[contains(@class,"product-item-link") and contains(.,"%s")]/ancestor::li';
 
     /**
      * This member holds the class name of the regular price block.
@@ -43,14 +43,14 @@ class ListProduct extends Block
      *
      * @var string
      */
-    protected $productDetailsSelector = '//*[contains(@class, "product details") and .//*[@title="%s"]]';
+    protected $productDetailsSelector = '//*[contains(@class, "product details") and contains(.,"%s")]';
 
     /**
      * Product name.
      *
      * @var string
      */
-    protected $productTitle = '.product.name [title="%s"]';
+    protected $productTitle = './/*[@class="product name product-item-name"]/a[text()="%s"]';
 
     /**
      * Click for Price link on category page.
@@ -173,7 +173,7 @@ protected function getProductDetailsElement($productName)
      */
     protected function getProductNameElement($productName)
     {
-        return $this->_rootElement->find(sprintf($this->productTitle, $productName));
+        return $this->_rootElement->find(sprintf($this->productTitle, $productName), Locator::SELECTOR_XPATH);
     }
 
     /**