MAGETWO-39534: Fix functional test for checkout flow

Author: Ievgen Shakhsuvarov

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

@@ -10,8 +10,7 @@
 use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
- * Class Login
- * One page checkout status login block
+ * One page checkout status login block.
  */
 class Login extends Form
 {
@@ -51,7 +50,7 @@ class Login extends Form
     protected $loadingMask = '.loading-mask';
 
     /**
-     * Select how to perform checkout whether guest or registered customer
+     * Select how to perform checkout whether guest or registered customer.
      *
      * @param FixtureInterface $fixture
      * @return void
@@ -68,7 +67,7 @@ public function checkoutMethod(FixtureInterface $fixture)
     }
 
     /**
-     * Perform guest checkout
+     * Perform guest checkout.
      *
      * @return void
      */
@@ -79,27 +78,20 @@ public function guestCheckout()
     }
 
     /**
-     * Login customer during checkout
+     * Login customer during checkout.
      *
      * @param FixtureInterface $customer
      * @return void
      */
     public function loginCustomer(FixtureInterface $customer)
     {
-        $data = $customer->getData();
-        $mapping = $this->dataMapping($data);
-        $login['email'] = $mapping['email'];
-        $this->_fill($login);
-        sleep(3);
-        $this->waitForElementNotVisible('._block-content-loading');
-        $password['password'] = $mapping['password'];
-        $this->_fill($password);
+        $this->fill($customer);
         $this->_rootElement->find($this->login)->click();
         $this->waitForElementNotVisible($this->loadingMask);
     }
 
     /**
-     * Click continue on checkout method block
+     * Click continue on checkout method block.
      *
      * @return void
      */

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

@@ -7,29 +7,21 @@
 namespace Magento\Checkout\Test\Block\Onepage\Payment;
 
 use Magento\Mtf\Block\Block;
-use Magento\Payment\Test\Fixture\CreditCard;
 
 /**
  * Checkout payment method block.
  */
 class Method extends Block
 {
     /**
-     * Wait element
+     * Wait element.
      *
      * @var string
      */
     protected $waitElement = '.loading-mask';
 
     /**
-     * Purchase order number selector
-     *
-     * @var string
-     */
-    protected $purchaseOrderNumber = '#po_number';
-
-    /**
-     * Continue checkout button.
+     * Place order button selector.
      *
      * @var string
      */
@@ -56,14 +48,14 @@ public function clickPlaceOrder()
     /**
      * Get "Billing Address" block.
      *
-     * @return \Magento\Checkout\Test\Block\Onepage\Payment\Methods\Billing
+     * @return \Magento\Checkout\Test\Block\Onepage\Payment\Method\Billing
      */
     public function getBillingBlock()
     {
         $element = $this->_rootElement->find($this->billingAddressSelector);
 
         return $this->blockFactory->create(
-            '\Magento\Checkout\Test\Block\Onepage\Payment\Methods\Billing',
+            '\Magento\Checkout\Test\Block\Onepage\Payment\Method\Billing',
             ['element' => $element]
         );
     }

dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Methods/Billing.php renamed to dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Method/Billing.php

@@ -4,10 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Checkout\Test\Block\Onepage\Payment\Methods;
+namespace Magento\Checkout\Test\Block\Onepage\Payment\Method;
 
 use Magento\Customer\Test\Fixture\Address;
-use Magento\Customer\Test\Fixture\Customer;
 use Magento\Mtf\Block\Form;
 use Magento\Mtf\Client\Locator;
 
@@ -43,12 +42,10 @@ class Billing extends Form
      * @param Address $billingAddress
      * @return void
      */
-    public function fillBilling(Address $billingAddress = null)
+    public function fillBilling(Address $billingAddress)
     {
-        if ($billingAddress) {
-            $this->fill($billingAddress);
-            $this->clickUpdate();
-        }
+        $this->fill($billingAddress);
+        $this->clickUpdate();
         $this->waitForElementNotVisible($this->waitElement);
     }
 

dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Methods/Billing.xml renamed to dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Method/Billing.xml

@@ -7,45 +7,11 @@
 namespace Magento\Checkout\Test\Block\Onepage;
 
 use Magento\Mtf\Block\Form;
-use Magento\Mtf\Client\Locator;
-use Magento\Mtf\Client\Element\SimpleElement;
-use Magento\Checkout\Test\Fixture\Checkout;
 
 /**
- * Class Shipping
- * One page checkout status shipping block
- *
+ * Checkout shipping address block.
  */
 class Shipping extends Form
 {
-    /**
-     * Continue checkout button
-     *
-     * @var string
-     */
-    protected $continue = '#shipping-buttons-container button';
-
-    /**
-     * Wait element
-     *
-     * @var string
-     */
-    protected $waitElement = '.loading-mask';
-
-    /**
-     * Fill shipping address
-     *
-     * @param $fixture
-     * @return void
-     */
-    public function fillShipping($fixture)
-    {
-        if ($fixture instanceof Checkout) {
-            $fixture = $fixture->getShippingAddress();
-        }
-        if (!$fixture) {
-            return;
-        }
-        $this->fill($fixture);
-    }
+    //
 }

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

@@ -10,9 +10,7 @@
 use Magento\Mtf\Client\Locator;
 
 /**
- * Class Method
  * One page checkout status shipping method block
- *
  */
 class Method extends Block
 {
@@ -45,13 +43,14 @@ class Method extends Block
     protected $blockWaitElement = '._block-content-loading';
 
     /**
-     * Select shipping method
+     * Select shipping method.
      *
      * @param array $method
      * @return void
      */
     public function selectShippingMethod(array $method)
     {
+        // Code under test uses JavaScript setTimeout at this point as well.
         sleep(3);
         $selector = sprintf($this->shippingMethod, $method['shipping_method'], $method['shipping_service']);
         $this->waitForElementNotVisible($this->blockWaitElement);

dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php

@@ -32,7 +32,7 @@ public function processAssert(CheckoutOnepage $checkoutOnepage, $billingCheckbox
         \PHPUnit_Framework_Assert::assertEquals(
             $billingCheckboxState,
             $actualResult,
-            "\"Same as Shipping\" checkbox has wrong value"
+            '"Same as Shipping" checkbox has wrong value'
         );
     }
 

dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertBillingAddressSameAsShippingCheckbox.php

@@ -12,32 +12,24 @@
 use Magento\Checkout\Test\Constraint\AssertBillingAddressSameAsShippingCheckbox;
 
 /**
- * Class FillBillingInformationStep
- * Fill billing information
+ * Fill billing information.
  */
 class FillBillingInformationStep implements TestStepInterface
 {
     /**
-     * Onepage checkout page
+     * Onepage checkout page.
      *
      * @var CheckoutOnepage
      */
     protected $checkoutOnepage;
 
     /**
-     * Address fixture
+     * Address fixture.
      *
      * @var Address
      */
     protected $billingAddress;
 
-    /**
-     * Checkout method
-     *
-     * @var string
-     */
-    protected $checkoutMethod;
-
     /**
      * "Same as Shipping" checkbox value assertion.
      *
@@ -55,36 +47,36 @@ class FillBillingInformationStep implements TestStepInterface
     /**
      * @constructor
      * @param CheckoutOnepage $checkoutOnepage
+     * @param AssertBillingAddressSameAsShippingCheckbox $assertBillingAddressCheckbox
      * @param Address $billingAddress
-     * @param AssertBillingAddressSameAsShippingCheckbox $assertBillingAddressCheckbox,
-     * @param string $checkoutMethod
      * @param string $billingCheckboxState
      */
     public function __construct(
         CheckoutOnepage $checkoutOnepage,
-        $checkoutMethod,
         AssertBillingAddressSameAsShippingCheckbox $assertBillingAddressCheckbox,
         Address $billingAddress = null,
         $billingCheckboxState = null
     ) {
         $this->checkoutOnepage = $checkoutOnepage;
         $this->billingAddress = $billingAddress;
-        $this->checkoutMethod = $checkoutMethod;
         $this->assertBillingAddressCheckbox = $assertBillingAddressCheckbox;
         $this->billingCheckboxState = $billingCheckboxState;
     }
 
     /**
-     * Fill billing address
+     * Fill billing address.
      *
      * @return void
      */
     public function run()
     {
-        if ($this->billingCheckboxState !== null) {
+        if ($this->billingCheckboxState) {
             $this->assertBillingAddressCheckbox->processAssert($this->checkoutOnepage, $this->billingCheckboxState);
         }
-        $selectedPaymentMethod = $this->checkoutOnepage->getPaymentBlock()->getSelectedPaymentMethodBlock();
-        $selectedPaymentMethod->getBillingBlock()->fillBilling($this->billingAddress);
+
+        if ($this->billingAddress) {
+            $selectedPaymentMethod = $this->checkoutOnepage->getPaymentBlock()->getSelectedPaymentMethodBlock();
+            $selectedPaymentMethod->getBillingBlock()->fillBilling($this->billingAddress);
+        }
     }
 }

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

@@ -29,27 +29,17 @@ class FillShippingAddressStep implements TestStepInterface
      */
     protected $shippingAddress;
 
-    /**
-     * Checkout method.
-     *
-     * @var string
-     */
-    protected $checkoutMethod;
-
     /**
      * @constructor
      * @param CheckoutOnepage $checkoutOnepage
      * @param Address $shippingAddress
-     * @param string $checkoutMethod
      */
     public function __construct(
         CheckoutOnepage $checkoutOnepage,
-        $checkoutMethod,
         Address $shippingAddress = null
     ) {
         $this->checkoutOnepage = $checkoutOnepage;
         $this->shippingAddress = $shippingAddress;
-        $this->checkoutMethod = $checkoutMethod;
     }
 
     /**
@@ -59,8 +49,8 @@ public function __construct(
      */
     public function run()
     {
-        if (!empty($this->shippingAddress)) {
-            $this->checkoutOnepage->getShippingBlock()->fillShipping($this->shippingAddress);
+        if ($this->shippingAddress) {
+            $this->checkoutOnepage->getShippingBlock()->fill($this->shippingAddress);
         }
     }
 }