Merge branch 'MAGETWO-90968' into MPI-PR

Author: YevSent

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Creditmemo/Form/Items.php

@@ -51,6 +51,9 @@ public function getItemProductBlock($productSku)
      */
     public function clickUpdateQty()
     {
-        $this->_rootElement->find($this->updateQty)->click();
+        $button = $this->_rootElement->find($this->updateQty);
+        if (!$button->isDisabled()) {
+            $button->click();
+        }
     }
 }

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

@@ -123,6 +123,9 @@ public function getAdjustmentFeeElement()
      */
     public function clickUpdateTotals()
     {
-        $this->_rootElement->find($this->updateTotalsSelector)->click();
+        $button = $this->_rootElement->find($this->updateTotalsSelector);
+        if (!$button->isDisabled()) {
+            $button->click();
+        }
     }
 }

dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoCreditMemoButton.php

@@ -30,7 +30,7 @@ public function processAssert(SalesOrderView $salesOrderView, OrderIndex $orderI
         $orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $order->getId()]);
         \PHPUnit_Framework_Assert::assertFalse(
             $salesOrderView->getPageActions()->isActionButtonVisible('Credit Memo'),
-            'Credit memo button is present on order view page.'
+            'Credit memo button should not be present on order view page.'
         );
     }
 

dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CreateCreditMemoStep.php

@@ -96,11 +96,8 @@ public function run()
                 $this->orderCreditMemoNew->getFormBlock()->updateQty();
             }
 
-            $hasChangeTotals = $this->compareRefundTotalsData($refundData);
             $this->orderCreditMemoNew->getFormBlock()->fillFormData($refundData);
-            if ($hasChangeTotals) {
-                $this->orderCreditMemoNew->getTotalsBlock()->clickUpdateTotals();
-            }
+            $this->orderCreditMemoNew->getTotalsBlock()->clickUpdateTotals();
 
             $this->orderCreditMemoNew->getFormBlock()->submit();
         }
@@ -121,31 +118,4 @@ protected function getCreditMemoIds()
         $this->salesOrderView->getOrderForm()->openTab('creditmemos');
         return $this->salesOrderView->getOrderForm()->getTab('creditmemos')->getGridBlock()->getIds();
     }
-
-    /**
-     * Compare refund total items.
-     *
-     * @param array $data
-     * @return int
-     */
-    private function compareRefundTotalsData($data)
-    {
-        $compareData = [
-            'shipping_amount' =>
-                $this->orderCreditMemoNew->getTotalsBlock()->getRefundShippingElement()->getValue(),
-            'adjustment_positive' =>
-                $this->orderCreditMemoNew->getTotalsBlock()->getAdjustmentRefundElement()->getValue(),
-            'adjustment_negative' =>
-                $this->orderCreditMemoNew->getTotalsBlock()->getAdjustmentFeeElement()->getValue(),
-        ];
-
-        $count = 0;
-        foreach ($compareData as $key => $val) {
-            if (isset($data['form_data'][$key])) {
-                $count += ($val != $data['form_data'][$key] ? 1 : 0);
-            }
-        }
-
-        return $count;
-    }
 }