MTA-2308: [CS] Wishlist module functional tests maintenance

Dmytro Bursak · Dmytro Bursak · commit 186f682331c4 · 2015-06-09T18:28:25.000+03:00
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Product/Composite/Configure.php b/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
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Composite/Configure.php b/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;
             }
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductInCustomerWishlistOnBackendGrid.php b/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.'
         );
     }
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php
@@ -41,7 +41,7 @@ public function processAssert(
         $wishlistGrid = $customerIndexEdit->getCustomerForm()->getTab('wishlist')->getSearchGridBlock();
 
         \PHPUnit_Framework_Assert::assertTrue(
-            $wishlistGrid->isRowVisible(['product_name' => $product->getName()], true, false),
+            $wishlistGrid->isRowVisible(['product_name' => $product->getName()]),
             $product->getName() . " is not visible in customer wishlist on backend."
         );
     }
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.php b/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 */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.xml
@@ -20,7 +20,6 @@
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductsIsAbsentInWishlist" />
         </variation>
         <variation name="AddProductsToCartFromCustomerWishlistOnFrontendTestVariation3">
-            <data name="issue" xsi:type="string">Bug: MAGETWO-36215</data>
             <data name="products" xsi:type="string">catalogProductSimple::default,catalogProductVirtual::product_50_dollar,catalogProductSimple::default,catalogProductVirtual::product_50_dollar</data>
             <data name="qty" xsi:type="string">-</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertProductQtyInShoppingCart" />
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.php b/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 */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductFromCustomerWishlistOnBackendTest.php b/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 */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.php
@@ -29,7 +29,6 @@ class MoveProductFromShoppingCartToWishlistTest extends AbstractWishlistTest
     /* tags */
     const MVP = 'no';
     const DOMAIN = 'CS';
-    const STABLE = 'no';
     /* end tags */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.php
@@ -37,7 +37,6 @@ class ShareWishlistEntityTest extends Injectable
     /* tags */
     const MVP = 'no';
     const DOMAIN = 'CS';
-    const TO_MAINTAIN = 'yes';
     /* end tags */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.php
@@ -33,7 +33,6 @@ class ViewProductInCustomerWishlistOnBackendTest extends AbstractWishlistTest
     /* tags */
     const MVP = 'no';
     const DOMAIN = 'CS';
-    const TO_MAINTAIN = 'yes';
     /* end tags */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.xml
@@ -20,7 +20,7 @@
             <constraint name="Magento\Bundle\Test\Constraint\AssertBundleProductInCustomerWishlistOnBackendGrid" />
         </variation>
         <variation name="ViewProductInCustomerWishlistOnBackendTestVariation4">
-            <data name="issue" xsi:type="string">Bug: MAGETWO-34633</data>
+            <!--<data name="issue" xsi:type="string">Bug: MAGETWO-34633</data>-->
             <data name="product" xsi:type="string">downloadableProduct::with_two_separately_links</data>
             <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductInCustomerWishlistOnBackendGrid" />
         </variation>

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class Configure extends \Magento\Catalog\Test\Block\Adminhtml\Product\Composite\`
`19`	`19`	`*`
`20`	`20`	`* @var string`
`21`	`21`	`*/`
`22`		`- protected $option = '//div[@class="composite-bundle"]//label[.="%option_name%"]//following-sibling::*//%selector%';`
	`22`	`+ protected $option = '//label[contains(.,"%option_name%")]//following-sibling::*//%selector%';`
`23`	`23`
`24`	`24`	`/**`
`25`	`25`	`* Fill options for the product`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ protected function waitForFormVisible()`
`103`	`103`	`{`
`104`	`104`	`$context = $this->_rootElement;`
`105`	`105`	`$selector = $this->configureForm;`
`106`		`- return $this->browser->waitUntil(`
	`106`	`+ $this->browser->waitUntil(`
`107`	`107`	`function () use ($context, $selector) {`
`108`	`108`	`return $context->find($selector)->isVisible() ? true : null;`
`109`	`109`	`}`
`@@ -119,7 +119,7 @@ protected function waitForFormNotVisible()`
`119`	`119`	`{`
`120`	`120`	`$context = $this->_rootElement;`
`121`	`121`	`$selector = $this->configureForm;`
`122`		`- return $this->browser->waitUntil(`
	`122`	`+ $this->browser->waitUntil(`
`123`	`123`	`function () use ($context, $selector) {`
`124`	`124`	`return $context->find($selector)->isVisible() ? null : true;`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function processAssert(CustomerIndexEdit $customerIndexEdit, FixtureInter`
`31`	`31`	`/** @var Grid $wishlistGrid */`
`32`	`32`	`$wishlistGrid = $customerIndexEdit->getCustomerForm()->getTab('wishlist')->getSearchGridBlock();`
`33`	`33`	`\PHPUnit_Framework_Assert::assertTrue(`
`34`		`- $wishlistGrid->isRowVisible($filter, true, false),`
	`34`	`+ $wishlistGrid->isRowVisible($filter),`
`35`	`35`	`'Product ' . $product->getName() . ' is absent in grid with configure option.'`
`36`	`36`	`);`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function processAssert(`
`41`	`41`	`$wishlistGrid = $customerIndexEdit->getCustomerForm()->getTab('wishlist')->getSearchGridBlock();`
`42`	`42`
`43`	`43`	`\PHPUnit_Framework_Assert::assertTrue(`
`44`		`- $wishlistGrid->isRowVisible(['product_name' => $product->getName()], true, false),`
	`44`	`+ $wishlistGrid->isRowVisible(['product_name' => $product->getName()]),`
`45`	`45`	`$product->getName() . " is not visible in customer wishlist on backend."`
`46`	`46`	`);`
`47`	`47`	`}`