MTA-1899: Re-factor price blocks

Author: Oleksandr Manchenko

dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleInCategory.php

@@ -29,14 +29,14 @@ protected function assertPrice(FixtureInterface $bundle, CatalogCategoryView $ca
         /** @var BundleProduct $bundle */
         $priceData = $bundle->getDataFieldConfig('price')['source']->getPreset();
         //Price from/to verification
-        $priceBlock = $catalogCategoryView->getListProductBlock()->getProductPriceBlock($bundle->getName());
+        $priceBlock = $catalogCategoryView->getListProductBlock()->getProductItem($bundle)->getPriceBlock();
 
         if ($bundle->hasData('special_price') || $bundle->hasData('group_price')) {
-            $priceLow = $priceBlock->getFinalPrice();
+            $priceLow = $priceBlock->getPrice();
         } else {
             $priceLow = ($bundle->getPriceView() == 'Price Range')
                 ? $priceBlock->getPriceFrom()
-                : $priceBlock->getRegularPrice();
+                : $priceBlock->getPrice();
         }
 
         \PHPUnit_Framework_Assert::assertEquals(

dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceView.php

@@ -50,9 +50,9 @@ protected function assertPrice(BundleProduct $product, CatalogProductView $catal
         $priceBlock = $catalogProductView->getViewBlock()->getPriceBlock();
 
         if ($product->hasData('special_price') || $product->hasData('group_price')) {
-            $priceLow = $priceBlock->getFinalPrice();
+            $priceLow = $priceBlock->getPrice();
         } else {
-            $priceLow = ($priceView == 'Price Range') ? $priceBlock->getPriceFrom() : $priceBlock->getRegularPrice();
+            $priceLow = ($priceView == 'Price Range') ? $priceBlock->getPriceFrom() : $priceBlock->getPrice();
         }
 
         \PHPUnit_Framework_Assert::assertEquals(

dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductPage.php

@@ -27,9 +27,9 @@ protected function verifyPrice()
         $priceBlock = $this->productView->getPriceBlock();
 
         if ($this->product->hasData('special_price') || $this->product->hasData('group_price')) {
-            $priceLow = $priceBlock->getFinalPrice();
+            $priceLow = $priceBlock->getPrice();
         } else {
-            $priceLow = ($priceView == 'Price Range') ? $priceBlock->getPriceFrom() : $priceBlock->getRegularPrice();
+            $priceLow = ($priceView == 'Price Range') ? $priceBlock->getPriceFrom() : $priceBlock->getPrice();
         }
 
         $errors = [];

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/AbstractPriceBlock.php

@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Block;
+
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
+
+/**
+ * Base Price Block.
+ */
+abstract class AbstractPriceBlock extends Block
+{
+    /**
+     * Mapping for different type of price.
+     *
+     * @var array
+     */
+    protected $mapTypePrices = [];
+
+    /**
+     * Get specify type price.
+     *
+     * @param string $type
+     * @param string $currency [optional]
+     * @return string|null
+     */
+    protected function getTypePrice($type, $currency = '$')
+    {
+        $typePriceElement = $this->getTypePriceElement($type);
+        return $typePriceElement->isVisible() ? $this->escape($typePriceElement->getText(), $currency) : null;
+    }
+
+    /**
+     * Get specify type price element.
+     *
+     * @param string $type
+     * @return SimpleElement
+     */
+    protected function getTypePriceElement($type)
+    {
+        $mapTypePrice = $this->mapTypePrices[$type];
+        return $this->_rootElement->find(
+            $mapTypePrice['selector'],
+            isset($mapTypePrice['strategy']) ? $mapTypePrice['strategy'] : Locator::SELECTOR_CSS
+        );
+    }
+
+    /**
+     * Escape currency and separator for price.
+     *
+     * @param string $price
+     * @param string $currency
+     * @return string
+     */
+    protected function escape($price, $currency = '$')
+    {
+        return str_replace([',', $currency], '', $price);
+    }
+}

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

@@ -9,8 +9,7 @@
 use Magento\Catalog\Test\Block\Product\ProductList\ProductItem;
 use Magento\Mtf\Block\Block;
 use Magento\Mtf\Client\Locator;
-use Magento\Mtf\Client\Element\SimpleElement;
-use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Product list block.
@@ -24,62 +23,6 @@ class ListProduct extends Block
      */
     protected $productItem = './/*[contains(@class,"product-item-link") and text()="%s"]/ancestor::li';
 
-    /**
-     * This member holds the class name of the regular price block.
-     *
-     * @var string
-     */
-    protected $regularPriceClass = ".regular-price";
-
-    /**
-     * This member holds the class name for the price block found inside the product details.
-     *
-     * @var string
-     */
-    protected $priceBlockClass = 'price-box';
-
-    /**
-     * This member contains the selector to find the product details for the named product.
-     *
-     * @var string
-     */
-    protected $productDetailsSelector = '//*[contains(@class, "product details") and .//*[text()="%s"]]';
-
-    /**
-     * Product name.
-     *
-     * @var string
-     */
-    protected $productTitle = './/*[@class="product name product-item-name"]/a[text()="%s"]';
-
-    /**
-     * Click for Price link on category page.
-     *
-     * @var string
-     */
-    protected $clickForPrice = "//div[contains(@class, 'product details') and ('%s')]//a[contains(@id, 'msrp-popup')]";
-
-    /**
-     * Minimum Advertised Price on category page.
-     *
-     * @var string
-     */
-    protected $oldPrice = ".old-price .price-container";
-
-    /**
-     * Price box CSS selector.
-     *
-     * @var string
-     */
-    protected $priceBox = '.price-box #product-price-%s .price';
-
-    /**
-     * Popup map price.
-     *
-     * @var string
-     */
-    protected $mapPopupPrice = '//ancestor::*[@id="map-popup-click-for-price"]';
-
     /**
      * Sorter dropdown selector.
      *
@@ -90,10 +33,10 @@ class ListProduct extends Block
     /**
      * Return product item block.
      *
-     * @param InjectableFixture $product
+     * @param FixtureInterface $product
      * @return ProductItem
      */
-    public function getProductItem(InjectableFixture $product)
+    public function getProductItem(FixtureInterface $product)
     {
         $locator = sprintf($this->productItem, $product->getName());
 
@@ -103,112 +46,6 @@ public function getProductItem(InjectableFixture $product)
         );
     }
 
-    /**
-     * This method returns the price box block for the named product.
-     *
-     * @param string $productName
-     * @return Price
-     */
-    public function getProductPriceBlock($productName)
-    {
-        $productDetails = $this->getProductDetailsElement($productName);
-
-        return $this->blockFactory->create(
-            'Magento\Catalog\Test\Block\Product\Price',
-            ['element' => $productDetails->find($this->priceBlockClass, Locator::SELECTOR_CLASS_NAME)]
-        );
-    }
-
-    /**
-     * Check if product with specified name is visible.
-     *
-     * @param string $productName
-     * @return bool
-     */
-    public function isProductVisible($productName)
-    {
-        return $this->getProductNameElement($productName)->isVisible();
-    }
-
-    /**
-     * Check if regular price is visible.
-     *
-     * @return bool
-     */
-    public function isRegularPriceVisible()
-    {
-        return $this->_rootElement->find($this->regularPriceClass)->isVisible();
-    }
-
-    /**
-     * Open product view page by clicking on product name.
-     *
-     * @param string $productName
-     * @return void
-     */
-    public function openProductViewPage($productName)
-    {
-        $this->getProductNameElement($productName)->click();
-    }
-
-    /**
-     * This method returns the element representing the product details for the named product.
-     *
-     * @param string $productName String containing the name of the product
-     * @return SimpleElement
-     */
-    protected function getProductDetailsElement($productName)
-    {
-        return $this->_rootElement->find(
-            sprintf($this->productDetailsSelector, $productName),
-            Locator::SELECTOR_XPATH
-        );
-    }
-
-    /**
-     * This method returns the element on the page associated with the product name.
-     *
-     * @param string $productName String containing the name of the product
-     * @return SimpleElement
-     */
-    protected function getProductNameElement($productName)
-    {
-        return $this->_rootElement->find(sprintf($this->productTitle, $productName), Locator::SELECTOR_XPATH);
-    }
-
-    /**
-     * Open MAP block on category page.
-     *
-     * @param string $productName
-     * @return void
-     */
-    public function openMapBlockOnCategoryPage($productName)
-    {
-        $this->_rootElement->find(sprintf($this->clickForPrice, $productName), Locator::SELECTOR_XPATH)->click();
-        $this->waitForElementVisible($this->mapPopupPrice, Locator::SELECTOR_XPATH);
-    }
-
-    /**
-     * Get Minimum Advertised Price on Category page.
-     *
-     * @return string
-     */
-    public function getOldPriceCategoryPage()
-    {
-        return $this->_rootElement->find($this->oldPrice, Locator::SELECTOR_CSS)->getText();
-    }
-
-    /**
-     * Retrieve product price by specified Id.
-     *
-     * @param int $productId
-     * @return string
-     */
-    public function getPrice($productId)
-    {
-        return $this->_rootElement->find(sprintf($this->priceBox, $productId), Locator::SELECTOR_CSS)->getText();
-    }
-
     /**
      * Get all terms used in sort.
      *

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

@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Block\Product;
+
+/**
+ * Minimum Advertised Price block.
+ */
+class Map extends \Magento\Catalog\Test\Block\AbstractPriceBlock
+{
+    /**
+     * Mapping for different type of price.
+     *
+     * @var array
+     */
+    protected $mapTypePrices = [
+        'actual_price' => [
+            'selector' => '.actual-price .price',
+        ],
+        'old_price' => [
+            'selector' => '.old-price .price-wrapper',
+        ]
+    ];
+
+    /**
+     * 'Add to Cart' button.
+     *
+     * @var string
+     */
+    protected $addToCart = '.action.tocart';
+
+    /**
+     * 'Close' button.
+     *
+     * @var string
+     */
+    protected $close = '.class="ui-dialog-buttonset .action.close';
+
+    /**
+     * Get actual Price value on frontend.
+     *
+     * @param string $currency
+     * @return null|string
+     */
+    public function getActualPrice($currency = '$')
+    {
+        return $this->getTypePrice('actual_price', $currency);
+    }
+
+    /**
+     * Get old Price value on frontend.
+     *
+     * @param string $currency
+     * @return null|string
+     */
+    public function getOldPrice($currency = '$')
+    {
+        return $this->getTypePrice('old_price', $currency);
+    }
+
+    /**
+     * Add product to shopping cart from MAP Block.
+     *
+     * @return void
+     */
+    public function addToCart()
+    {
+        $this->_rootElement->find($this->addToCart)->click();
+    }
+
+    /**
+     * Close MAP Block.
+     *
+     * @return void
+     */
+    public function close()
+    {
+        $this->_rootElement->find($this->close)->click();
+        $this->waitForElementNotVisible($this->close);
+    }
+}