Merge remote-tracking branch 'mavericks/MTA-3794-PR' into mavericks-PR

Author: rliukshyn

dev/tests/functional/tests/app/Magento/Braintree/Test/etc/testcase.xml

@@ -106,8 +106,8 @@
         <step name="selectPaymentMethod" module="Magento_Checkout" next="fillBillingInformation" />
         <step name="fillBillingInformation" module="Magento_Checkout" next="placeOrderWithPaypal" />
         <step name="placeOrderWithPaypal" module="Magento_Braintree" next="createInvoice" />
-        <step name="createInvoice" module="Magento_Sales" next="createBraintreeCreditMemo" />
-        <step name="createBraintreeCreditMemo" module="Magento_Braintree" />
+        <step name="createInvoice" module="Magento_Sales" next="createOnlineCreditMemo" />
+        <step name="createOnlineCreditMemo" module="Magento_Sales" />
     </scenario>
     <scenario name="SaveUseDeleteVaultForPaypalBraintreeTest" firstStep="setupConfiguration">
         <step name="setupConfiguration" module="Magento_Config" next="createProducts" />

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Transactions.php

@@ -8,7 +8,7 @@
 
 use Magento\Backend\Test\Block\Widget\Tab;
 use Magento\Mtf\Client\Locator;
-use Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Shipments\Grid;
+use Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Transactions\Grid;
 
 /**
  * Transactions tab.

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

@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sales\Test\Constraint;
+
+use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
+use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert that transactions status is closed on order page in Admin.
+ */
+class AssertTransactionStatus extends AbstractConstraint
+{
+    /**
+     * Assert that transactions status is closed on order page in Admin.
+     *
+     * @param OrderIndex $salesOrder
+     * @param SalesOrderView $salesOrderView
+     * @param array $transactions
+     * @param string $orderId
+     * @return void
+     */
+    public function processAssert(
+        OrderIndex $salesOrder,
+        SalesOrderView $salesOrderView,
+        array $transactions,
+        $orderId
+    ) {
+        $salesOrder->open();
+        $salesOrder->getSalesOrderGrid()->searchAndOpen(['id' => $orderId]);
+        $salesOrderView->getOrderForm()->openTab('transactions');
+        $actualTransactions = $salesOrderView->getOrderForm()->getTab('transactions')->getGridBlock()->getIds();
+
+        foreach ($transactions as $transaction) {
+            foreach ($actualTransactions as $actualTransaction) {
+                if ($actualTransaction['transactionType'] === $transaction['transactionType']) {
+                    \PHPUnit_Framework_Assert::assertEquals(
+                        $transaction['statusIsClosed'],
+                        $actualTransaction['statusIsClosed'],
+                        'The ' . $transaction['transactionType'] . ' transaction status is not closed.'
+                    );
+                    break;
+                }
+            }
+        }
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Transactions status is closed.';
+    }
+}

dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CreateBraintreeCreditMemoStep.php renamed to dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CreateOnlineCreditMemoStep.php

@@ -4,9 +4,8 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Braintree\Test\TestStep;
+namespace Magento\Sales\Test\TestStep;
 
-use Magento\Mtf\ObjectManager;
 use Magento\Mtf\TestStep\TestStepInterface;
 use Magento\Sales\Test\Fixture\OrderInjectable;
 use Magento\Sales\Test\Page\Adminhtml\OrderCreditMemoNew;
@@ -15,9 +14,9 @@
 use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
 
 /**
- * Create credit memo for order placed via Braintree credit card payment method.
+ * Create credit memo for order placed using online payment methods.
  */
-class CreateBraintreeCreditMemoStep implements TestStepInterface
+class CreateOnlineCreditMemoStep implements TestStepInterface
 {
     /**
      * Orders Page.

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

@@ -23,21 +23,42 @@ class SubmitOrderStep implements TestStepInterface
      *
      * @var OrderCreateIndex
      */
-    protected $orderCreateIndex;
+    private $orderCreateIndex;
 
     /**
      * Sales order view.
      *
      * @var SalesOrderView
      */
-    protected $salesOrderView;
+    private $salesOrderView;
 
     /**
      * Factory for fixtures.
      *
      * @var FixtureFactory
      */
-    protected $fixtureFactory;
+    private $fixtureFactory;
+
+    /**
+     * Customer fixture.
+     *
+     * @var Customer
+     */
+    private $customer;
+
+    /**
+     * Billing Address fixture.
+     *
+     * @var Address
+     */
+    private $billingAddress;
+
+    /**
+     * Products fixtures.
+     *
+     * @var array|\Magento\Mtf\Fixture\FixtureInterface[]
+     */
+    private $products;
 
     /**
      * @constructor