MTA-1814: Analyse functional test failures - Sprint 9

Author: Oleksandr Manchenko

dev/tests/functional/tests/app/Magento/AdminNotification/Test/Block/System/Messages.php

@@ -1,9 +1,7 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\AdminNotification\Test\Block\System;

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

@@ -151,4 +151,14 @@ public function isSpecialPriceVisible()
     {
         return $this->getTypePriceElement('special_price')->isVisible();
     }
+
+    /**
+     * This method returns if the old price is visible.
+     *
+     * @return bool
+     */
+    public function isOldPriceVisible()
+    {
+        return $this->getTypePriceElement('old_price')->isVisible();
+    }
 }

dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCategory.php

@@ -13,12 +13,12 @@
 use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
- * Class AssertProductInCategory
+ * Checking the product in the page of its price.
  */
 class AssertProductInCategory extends AbstractConstraint
 {
     /**
-     * Checking the product in the page of its price
+     * Checking the product in the page of its price.
      *
      * @param CatalogCategoryView $catalogCategoryView
      * @param CmsIndex $cmsIndex
@@ -56,25 +56,33 @@ public function processAssert(
     }
 
     /**
-     * Verify product price on category view page
+     * Verify product price on category view page.
      *
      * @param FixtureInterface $product
      * @param CatalogCategoryView $catalogCategoryView
      * @return void
      */
     protected function assertPrice(FixtureInterface $product, CatalogCategoryView $catalogCategoryView)
     {
-        $price = $catalogCategoryView->getListProductBlock()->getProductItem($product)->getPriceBlock()->getPrice();
+        $priceBlock = $catalogCategoryView->getListProductBlock()->getProductItem($product)->getPriceBlock();
 
         \PHPUnit_Framework_Assert::assertEquals(
             number_format($product->getPrice(), 2, '.', ''),
-            $price,
+            $priceBlock->isOldPriceVisible() ? $priceBlock->getOldPrice() : $priceBlock->getPrice(),
             'Product regular price on category page is not correct.'
         );
+
+        if ($product->hasData('special_price')) {
+            \PHPUnit_Framework_Assert::assertEquals(
+                number_format($product->getSpecialPrice(), 2, '.', ''),
+                $priceBlock->getSpecialPrice(),
+                'Product special price on category page is not correct.'
+            );
+        }
     }
 
     /**
-     * Returns a string representation of the object
+     * Returns a string representation of the object.
      *
      * @return string
      */

dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php

@@ -110,14 +110,15 @@ protected function verifyPrice()
             return null;
         }
 
-        $fixtureProductPrice = number_format($this->product->getPrice(), 2);
-        $formProductPrice = $this->productView->getPriceBlock()->getPrice();
+        $priceBlock = $this->productView->getPriceBlock();
+        $formPrice = $priceBlock->isOldPriceVisible() ? $priceBlock->getOldPrice() : $priceBlock->getPrice();
+        $fixturePrice = number_format($this->product->getPrice(), 2, '.', '');
 
-        if ($fixtureProductPrice == $formProductPrice) {
-            return null;
+        if ($fixturePrice != $formPrice) {
+            return "Displayed product price on product page(front-end) not equals passed from fixture. "
+                . "Actual: {$fixturePrice}, expected: {$formPrice}.";
         }
-        return "Displayed product price on product page(front-end) not equals passed from fixture. "
-        . "Actual: {$formProductPrice}, expected: {$fixtureProductPrice}.";
+        return null;
     }
 
     /**

dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php

@@ -21,7 +21,7 @@ class Sidebar extends Block
      *
      * @var string
      */
-    protected $qty = '//*[@class="product"]/*[@title="%s"]/following-sibling::*//*[@class="value qty"]';
+    protected $qty = '//*[@class="product"]/*[@title="%s"]/following-sibling::*//*[contains(@class,"item-qty")]';
 
     /**
      * Mini cart link selector
@@ -37,12 +37,19 @@ class Sidebar extends Block
      */
     protected $cartContent = 'div.minicart';
 
+    /**
+     * Product list in mini shopping cart.
+     *
+     * @var string
+     */
+    protected $cartProductList = './/*[contains(@role, "dialog") and not(contains(@style,"display: none;"))]';
+
     /**
      * Selector for cart item block
      *
      * @var string
      */
-    protected $cartProductName = './/*[@id="mini-cart"]//li[.//a[normalize-space(text())="%s"]]';
+    protected $cartProductName = '//*[@id="mini-cart"]//li[.//a[normalize-space(text())="%s"]]';
 
     /**
      * Counter qty locator
@@ -91,7 +98,7 @@ public function getProductQty($productName)
     {
         $this->openMiniCart();
         $productQty = sprintf($this->qty, $productName);
-        return $this->_rootElement->find($productQty, Locator::SELECTOR_XPATH)->getText();
+        return $this->_rootElement->find($productQty, Locator::SELECTOR_XPATH)->getValue();
     }
 
     /**
@@ -110,7 +117,7 @@ public function getCartItem(FixtureInterface $product)
             $cartItem = $this->callRender($typeId, 'getCartItem', ['product' => $product]);
         } else {
             $cartItemBlock = $this->_rootElement->find(
-                sprintf($this->cartProductName, $product->getName()),
+                sprintf($this->cartProductList . $this->cartProductName, $product->getName()),
                 Locator::SELECTOR_XPATH
             );
             $cartItem = $this->blockFactory->create(

dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php

@@ -108,7 +108,7 @@ public function test(CatalogProductSimple $product)
         $this->browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
         $productView = $this->catalogProductView->getViewBlock();
         $productView->fillOptions($product);
-        $productView->setQty(1);
+        $productView->setQty($product->getCheckoutData()['qty']);
         $productView->clickAddToCart();
         $this->catalogProductView->getMessagesBlock()->waitSuccessMessage();
 

dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.xml

@@ -19,7 +19,6 @@
             <constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInShoppingCart" />
         </variation>
         <variation name="UpdateShoppingCartTestVariation2">
-            <data name="issue" xsi:type="string">Bug: MAGETWO-35274</data>
             <data name="product/dataSet" xsi:type="string">with_two_custom_option</data>
             <data name="product/data/price/value" xsi:type="string">50</data>
             <data name="product/data/checkout_data/qty" xsi:type="string">11</data>

dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinkRow.php

@@ -19,7 +19,7 @@ class LinkRow extends Form
      *
      * @var string
      */
-    protected $deleteButton = '.delete-link-item';
+    protected $deleteButton = '.action-remove';
 
     /**
      * Fill item link

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

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