MTA-560: Re-factor Tests for Online Onepage Checkout

- CR Changes

Author: Roman Liukshyn

dev/tests/functional/credentials.xml.dist

@@ -25,6 +25,9 @@
     <field path="section/carriers_usps_userid/value" value="" />
     <field path="section/carriers_usps_password/value" value="" />
 
+    <field path="section/payment_authorizenet_login/value" value="" />
+    <field path="section/payment_authorizenet_trans_key/value" value="" />
+
     <field path="section/payment_paypal_group_all_in_one_wpp_usuk_wpp_required_settings_wpp_and_express_checkout_business_account/value" value="" />
     <field path="section/payment_paypal_group_all_in_one_wpp_usuk_wpp_required_settings_wpp_and_express_checkout_api_username/value" value="" />
     <field path="section/payment_paypal_group_all_in_one_wpp_usuk_wpp_required_settings_wpp_and_express_checkout_api_password/value" value="" />

dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Methods.php

@@ -62,11 +62,11 @@ class Methods extends Form
      * Select payment method
      *
      * @param array $payment
-     * @param CreditCard $creditCard
+     * @param CreditCard|null $creditCard
      * @throws \Exception
      * @return void
      */
-    public function selectPaymentMethod(array $payment, CreditCard $creditCard)
+    public function selectPaymentMethod(array $payment, CreditCard $creditCard = null)
     {
         $paymentSelector = $this->_rootElement->find(sprintf($this->paymentMethodInput, $payment['method']));
         if ($paymentSelector->isVisible()) {
@@ -81,7 +81,7 @@ public function selectPaymentMethod(array $payment, CreditCard $creditCard)
         if ($payment['method'] == "purchaseorder") {
             $this->_rootElement->find($this->purchaseOrderNumber)->setValue($payment['po_number']);
         }
-        if ($creditCard->hasData()) {
+        if ($creditCard !== null) {
             /** @var \Magento\Payment\Test\Block\Form\Cc $formBlock */
             $formBlock = $this->blockFactory->create(
                 '\\Magento\\Payment\\Test\\Block\\Form\\Cc',

dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillShippingMethodStep.php

@@ -34,7 +34,7 @@ class FillShippingMethodStep implements TestStepInterface
      * @param CheckoutOnepage $checkoutOnepage
      * @param array $shipping
      */
-    public function __construct(CheckoutOnepage $checkoutOnepage, $shipping = [])
+    public function __construct(CheckoutOnepage $checkoutOnepage, array $shipping = [])
     {
         $this->checkoutOnepage = $checkoutOnepage;
         $this->shipping = $shipping;

dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectPaymentMethodStep.php

@@ -40,13 +40,13 @@ class SelectPaymentMethodStep implements TestStepInterface
     /**
      * @constructor
      * @param CheckoutOnepage $checkoutOnepage
-     * @param CreditCard $creditCard
      * @param array $payment
+     * @param CreditCard|null $creditCard
      */
     public function __construct(
         CheckoutOnepage $checkoutOnepage,
-        CreditCard $creditCard,
-        array $payment
+        array $payment,
+        CreditCard $creditCard = null
     ) {
         $this->checkoutOnepage = $checkoutOnepage;
         $this->payment = $payment;

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

@@ -9,14 +9,14 @@
   <scenario name="OnePageCheckoutTest" firstStep="setupConfiguration">
     <step name="setupConfiguration" module="Magento_Core" next="createProducts"/>
     <step name="createProducts" module="Magento_Catalog" next="createTaxRule"/>
-    <step name="createTaxRule" module="Magento_Tax" next="createRewardExchangeRates"/>
+    <step name="createTaxRule" module="Magento_Tax" next="addProductsToTheCart"/>
     <step name="addProductsToTheCart" module="Magento_Checkout" next="estimateShippingAndTax"/>
-    <step name="estimateShippingAndTax" module="Magento_Checkout" next="applyGiftCard"/>
+    <step name="estimateShippingAndTax" module="Magento_Checkout" next="proceedToCheckout"/>
     <step name="proceedToCheckout" module="Magento_Checkout" next="createCustomer"/>
-    <step name="createCustomer" module="Magento_Customer" next="applyCustomerBalanceToCustomer"/>
+    <step name="createCustomer" module="Magento_Customer" next="selectCheckoutMethod"/>
     <step name="selectCheckoutMethod" module="Magento_Checkout" next="fillBillingInformation"/>
     <step name="fillBillingInformation" module="Magento_Checkout" next="fillShippingMethod"/>
-    <step name="fillShippingMethod" module="Magento_Checkout" next="selectStoreCredit"/>
+    <step name="fillShippingMethod" module="Magento_Checkout" next="selectPaymentMethod"/>
     <step name="selectPaymentMethod" module="Magento_Checkout" next="placeOrder"/>
     <step name="placeOrder" module="Magento_Checkout"/>
   </scenario>

dev/tests/functional/tests/app/Magento/Core/Test/Handler/ConfigData/Curl.php

@@ -59,7 +59,7 @@ protected function prepareData(FixtureInterface $fixture)
         $fields = $fixture->getData();
         if (isset($fields['section'])) {
             foreach ($fields['section'] as $itemSection) {
-                parse_str($this->modify($itemSection), $configPath);
+                parse_str($this->modifyConfigPath($itemSection), $configPath);
                 $result = array_merge_recursive($result, $configPath);
             }
         }
@@ -69,10 +69,12 @@ protected function prepareData(FixtureInterface $fixture)
     /**
      * Modify config path.
      *
-     * @param $input
+     * From payment/cashondelivery/active to ['payment']['groups']['cashondelivery']['fields']['active']
+     *
+     * @param array $input
      * @return string
      */
-    protected function modify($input)
+    protected function modifyConfigPath(array $input)
     {
         $resultArray = '';
         $path = explode('/', $input['path']);

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

@@ -11,10 +11,15 @@
 use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
- * Assert  that comment about authorized amount exist in Comments History section on order page in backend
+ * Assert that comment about authorized amount exist in Comments History section on order page in backend.
  */
 class AssertOrderCommentsHistory extends AbstractConstraint
 {
+    /**
+     * Message about authorized amount in order.
+     */
+    const AUTHORIZED_AMOUNT = 'Authorized amount of $';
+
     /**
      * Assert  that comment about authorized amount exist in Comments History section on order page in backend.
      *
@@ -34,10 +39,9 @@ public function processAssert(
         $salesOrder->getSalesOrderGrid()->searchAndOpen(['id' => $orderId]);
 
         $actualAuthorizedAmount = $salesOrderView->getOrderHistoryBlock()->getCommentsHistory();
-        $expectedAuthorizedAmount = 'Authorized amount of $' . $grandTotal;
 
         \PHPUnit_Framework_Assert::assertContains(
-            $expectedAuthorizedAmount,
+            self::AUTHORIZED_AMOUNT . $grandTotal,
             $actualAuthorizedAmount,
             'Incorrect authorized amount value for the order #' . $orderId
         );

dev/tests/functional/tests/app/Magento/Sales/Test/etc/di.xml

@@ -26,4 +26,9 @@
       <argument name="severity" xsi:type="string">high</argument>
     </arguments>
   </type>
+  <type name="Magento\Sales\Test\Constraint\AssertOrderCommentsHistory">
+    <arguments>
+      <argument name="severity" xsi:type="string">high</argument>
+    </arguments>
+  </type>
 </config>