Merge remote-tracking branch 'origin/MAGETWO-62624' into 2.0-develop-pr6

Author: zakdma

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php

@@ -121,7 +121,7 @@ class Create extends Block
     public function getItemsBlock()
     {
         return $this->blockFactory->create(
-            'Magento\Sales\Test\Block\Adminhtml\Order\Create\Items',
+            \Magento\Sales\Test\Block\Adminhtml\Order\Create\Items::class,
             ['element' => $this->_rootElement->find($this->itemsBlock, Locator::SELECTOR_CSS)]
         );
     }
@@ -134,7 +134,7 @@ public function getItemsBlock()
     public function getBillingAddressBlock()
     {
         return $this->blockFactory->create(
-            'Magento\Sales\Test\Block\Adminhtml\Order\Create\Billing\Address',
+            \Magento\Sales\Test\Block\Adminhtml\Order\Create\Billing\Address::class,
             ['element' => $this->_rootElement->find($this->billingAddressBlock, Locator::SELECTOR_CSS)]
         );
     }
@@ -147,7 +147,7 @@ public function getBillingAddressBlock()
     protected function getShippingAddressBlock()
     {
         return $this->blockFactory->create(
-            'Magento\Sales\Test\Block\Adminhtml\Order\Create\Shipping\Address',
+            \Magento\Sales\Test\Block\Adminhtml\Order\Create\Shipping\Address::class,
             ['element' => $this->_rootElement->find($this->shippingAddressBlock, Locator::SELECTOR_CSS)]
         );
     }
@@ -160,7 +160,7 @@ protected function getShippingAddressBlock()
     protected function getBillingMethodBlock()
     {
         return $this->blockFactory->create(
-            'Magento\Sales\Test\Block\Adminhtml\Order\Create\Billing\Method',
+            \Magento\Sales\Test\Block\Adminhtml\Order\Create\Billing\Method::class,
             ['element' => $this->_rootElement->find($this->billingMethodBlock, Locator::SELECTOR_CSS)]
         );
     }
@@ -173,7 +173,7 @@ protected function getBillingMethodBlock()
     protected function getShippingMethodBlock()
     {
         return $this->blockFactory->create(
-            'Magento\Sales\Test\Block\Adminhtml\Order\Create\Shipping\Method',
+            \Magento\Sales\Test\Block\Adminhtml\Order\Create\Shipping\Method::class,
             ['element' => $this->_rootElement->find($this->shippingMethodBlock, Locator::SELECTOR_CSS)]
         );
     }
@@ -183,10 +183,10 @@ protected function getShippingMethodBlock()
      *
      * @return \Magento\Sales\Test\Block\Adminhtml\Order\Create\Totals
      */
-    protected function getTotalsBlock()
+    public function getTotalsBlock()
     {
         return $this->blockFactory->create(
-            'Magento\Sales\Test\Block\Adminhtml\Order\Create\Totals',
+            \Magento\Sales\Test\Block\Adminhtml\Order\Create\Totals::class,
             ['element' => $this->_rootElement->find($this->totalsBlock, Locator::SELECTOR_CSS)]
         );
     }
@@ -199,7 +199,7 @@ protected function getTotalsBlock()
     public function getTemplateBlock()
     {
         return $this->blockFactory->create(
-            'Magento\Backend\Test\Block\Template',
+            \Magento\Backend\Test\Block\Template::class,
             ['element' => $this->_rootElement->find($this->templateBlock, Locator::SELECTOR_XPATH)]
         );
     }
@@ -212,7 +212,7 @@ public function getTemplateBlock()
     public function getGridBlock()
     {
         return $this->blockFactory->create(
-            'Magento\Sales\Test\Block\Adminhtml\Order\Create\Search\Grid',
+            \Magento\Sales\Test\Block\Adminhtml\Order\Create\Search\Grid::class,
             ['element' => $this->_rootElement->find($this->gridBlock, Locator::SELECTOR_CSS)]
         );
     }
@@ -225,7 +225,7 @@ public function getGridBlock()
     public function getAccountBlock()
     {
         return $this->blockFactory->create(
-            'Magento\Sales\Test\Block\Adminhtml\Order\Create\Form\Account',
+            \Magento\Sales\Test\Block\Adminhtml\Order\Create\Form\Account::class,
             ['element' => $this->_rootElement->find($this->accountInformationBlock, Locator::SELECTOR_CSS)]
         );
     }
@@ -250,7 +250,7 @@ public function updateProductsData(array $products)
     {
         /** @var \Magento\Sales\Test\Block\Adminhtml\Order\Create\Items $items */
         $items = $this->blockFactory->create(
-            'Magento\Sales\Test\Block\Adminhtml\Order\Create\Items',
+            \Magento\Sales\Test\Block\Adminhtml\Order\Create\Items::class,
             ['element' => $this->_rootElement->find($this->itemsBlock)]
         );
         foreach ($products as $product) {

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Totals.php

@@ -7,26 +7,97 @@
 namespace Magento\Sales\Test\Block\Adminhtml\Order\Create;
 
 use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
 
 /**
- * Class Totals
- * Adminhtml sales order create totals block
- *
+ * Adminhtml sales order create totals block.
  */
 class Totals extends Block
 {
     /**
-     * 'Submit Order' button
+     * 'Submit Order' button.
      *
      * @var string
      */
     protected $submitOrder = '.order-totals-actions button';
 
     /**
-     * Click 'Submit Order' button
+     * Order totals table.
+     *
+     * @var string
+     */
+    protected $totalsTable = '.data-table';
+
+    /**
+     * Total row label selector.
+     *
+     * @var string
+     */
+    protected $totalLabelLocator = './/tr[normalize-space(td)="%s"]';
+
+    /**
+     * Total value selector.
+     *
+     * @var string
+     */
+    protected $totalValueLocator = './/td/span[contains(@class,"price")]';
+
+    /**
+     * Click 'Submit Order' button.
      */
     public function submitOrder()
     {
         $this->_rootElement->find($this->submitOrder)->click();
     }
+
+    /**
+     * Return totals by labels.
+     *
+     * @param $totals string[]
+     * @return array
+     */
+    public function getTotals($totals)
+    {
+        if (empty ($totals)) {
+            return [];
+        }
+
+        $totalsResult = [];
+        $totalsTable = $this->_rootElement->find($this->totalsTable);
+
+        foreach ($totals as $total) {
+
+            $totalRow = $totalsTable->find(sprintf($this->totalLabelLocator, $total), Locator::SELECTOR_XPATH);
+            if ($totalRow->isVisible()) {
+                $totalValue = $totalRow->find($this->totalValueLocator, Locator::SELECTOR_XPATH);
+                $totalsResult[$total] = $this->escapeNumericValue($totalValue->getText());
+            }
+        }
+
+        return $totalsResult;
+    }
+
+    /**
+     * Return total presence by label.
+     *
+     * @param string $total
+     * @return bool
+     */
+    public function isTotalPresent($total)
+    {
+        $totalsTable = $this->_rootElement->find($this->totalsTable);
+        $totalRow = $totalsTable->find(sprintf($this->totalLabelLocator, $total), Locator::SELECTOR_XPATH);
+        return $totalRow->isVisible();
+    }
+
+    /**
+     * Escape numeric value.
+     *
+     * @param string $value
+     * @return mixed
+     */
+    private function escapeNumericValue($value)
+    {
+        return preg_replace("/[^-0-9\\.]/", "", $value);
+    }
 }