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

Author: Dmytro Bursak

dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Product/Composite/Configure.php

@@ -19,7 +19,7 @@ class Configure extends \Magento\Catalog\Test\Block\Adminhtml\Product\Composite\
      *
      * @var string
      */
-    protected $option = '//div[@class="composite-bundle"]//label[.="%option_name%"]//following-sibling::*//%selector%';
+    protected $option = '//label[contains(.,"%option_name%")]//following-sibling::*//%selector%';
 
     /**
      * Fill options for the product

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Composite/Configure.php

@@ -103,7 +103,7 @@ protected function waitForFormVisible()
     {
         $context = $this->_rootElement;
         $selector = $this->configureForm;
-        return $this->browser->waitUntil(
+        $this->browser->waitUntil(
             function () use ($context, $selector) {
                 return $context->find($selector)->isVisible() ? true : null;
             }
@@ -119,7 +119,7 @@ protected function waitForFormNotVisible()
     {
         $context = $this->_rootElement;
         $selector = $this->configureForm;
-        return $this->browser->waitUntil(
+        $this->browser->waitUntil(
             function () use ($context, $selector) {
                 return $context->find($selector)->isVisible() ? null : true;
             }

dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php

@@ -52,19 +52,12 @@ public function __construct(CmsIndex $cmsIndex, CustomerAccountLogout $customerA
      */
     public function run()
     {
-        /* @TODO: MAGETWO-37391
-         * $this->cmsIndex->open();
-         * $this->cmsIndex->getCmsPageBlock()->waitPageInit();
-         * if ($this->cmsIndex->getLinksBlock()->isLinkVisible("Log Out")) {
-         * $this->cmsIndex->getLinksBlock()->openLink("Log Out");
-         * $this->cmsIndex->getCmsPageBlock()->waitUntilTextIsVisible('Home Page');
-         * $this->cmsIndex->getCmsPageBlock()->waitPageInit();
-         * }
-         */
-        $this->customerAccountLogout->open();
-        if (self::LOGOUT_PAGE_TITLE == $this->cmsIndex->getCmsPageBlock()->getPageTitle()) {
+        $this->cmsIndex->open();
+        $this->cmsIndex->getCmsPageBlock()->waitPageInit();
+        if ($this->cmsIndex->getLinksBlock()->isLinkVisible("Log Out")) {
+            $this->cmsIndex->getLinksBlock()->openLink("Log Out");
             $this->cmsIndex->getCmsPageBlock()->waitUntilTextIsVisible('Home Page');
+            $this->cmsIndex->getCmsPageBlock()->waitPageInit();
         }
-        $this->cmsIndex->getCmsPageBlock()->waitPageInit();
     }
 }

dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductInCustomerWishlistOnBackendGrid.php

@@ -26,7 +26,7 @@ protected function prepareFilter(FixtureInterface $product)
     {
         $options = $this->prepareOptions($product);
 
-        return ['product_name' => $product->getName(), 'qty_from' => 1, 'qty_to' => 1, 'options' => $options];
+        return ['product_name' => $product->getName(), 'options' => $options];
     }
 
     /**

dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductInCustomerWishlistOnBackendGrid.php

@@ -31,7 +31,7 @@ public function processAssert(CustomerIndexEdit $customerIndexEdit, FixtureInter
         /** @var Grid $wishlistGrid */
         $wishlistGrid = $customerIndexEdit->getCustomerForm()->getTab('wishlist')->getSearchGridBlock();
         \PHPUnit_Framework_Assert::assertTrue(
-            $wishlistGrid->isRowVisible($filter, true, false),
+            $wishlistGrid->isRowVisible($filter),
             'Product ' . $product->getName() . ' is absent in grid with configure option.'
         );
     }

dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php

@@ -41,8 +41,8 @@ public function processAssert(
         $wishlistGrid = $customerIndexEdit->getCustomerForm()->getTab('wishlist')->getSearchGridBlock();
 
         \PHPUnit_Framework_Assert::assertTrue(
-            $wishlistGrid->isRowVisible(['product_name' => $product->getName()], true, false),
-            $product->getName() . " is not visible in Customer Wish List on Backend."
+            $wishlistGrid->isRowVisible(['product_name' => $product->getName()]),
+            $product->getName() . " is not visible in customer wishlist on backend."
         );
     }
 
@@ -53,6 +53,6 @@ public function processAssert(
      */
     public function toString()
     {
-        return "Product is visible in Customer Wish List on Backend.";
+        return "Product is visible in customer wishlist on backend.";
     }
 }

dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.php

@@ -29,7 +29,6 @@ class AddProductToWishlistEntityTest extends AbstractWishlistTest
     /* tags */
     const MVP = 'no';
     const DOMAIN = 'CS';
-    const STABLE = 'no';
     /* end tags */
 
     /**

dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml

@@ -14,7 +14,6 @@
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" />
         </variation>
         <variation name="AddProductToWishlistEntityTestVariation2">
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <data name="product" xsi:type="string">catalogProductVirtual::default</data>
             <constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage" />
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" />

dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.php

@@ -30,7 +30,6 @@ class ConfigureProductInCustomerWishlistOnFrontendTest extends AbstractWishlistT
     /* tags */
     const MVP = 'no';
     const DOMAIN = 'CS';
-    const TO_MAINTAIN = 'yes';
     /* end tags */
 
     /**

dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductFromCustomerWishlistOnBackendTest.php

@@ -35,7 +35,6 @@ class DeleteProductFromCustomerWishlistOnBackendTest extends AbstractWishlistTes
     /* tags */
     const MVP = 'no';
     const DOMAIN = 'CS';
-    const TO_MAINTAIN = 'yes';
     /* end tags */
 
     /**