Merge branch 'MTO-60-new' of git.epam.com:magn-fat/magn-fat-ce into iteration2-pr-new

# Conflicts:
#	dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml
#	dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php
#	dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillShippingAddressStep.php

Author: Vadim Zubovich

dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.php

@@ -33,7 +33,7 @@
  * 14. Perform assertions.
  *
  * @group One_Page_Checkout
- * @ZephyrId MAGETWO-27485, MAGETWO-12412, MAGETWO-12429
+ * @ZephyrId MAGETWO-27485, MAGETWO-12412, MAGETWO-12429, MAGETWO-42598, MAGETWO-42599
  * @ZephyrId MAGETWO-12444, MAGETWO-12848, MAGETWO-12849, MAGETWO-12850
  * @ZephyrId MAGETWO-42547
  */

dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml

@@ -200,8 +200,8 @@
             <data name="tag" xsi:type="string">stable:no</data>
             <data name="products/0" xsi:type="string">catalogProductSimple::simple_with_tier_price_and_order_qty_3</data>
             <data name="customer/dataset" xsi:type="string">default</data>
-            <data name="checkoutMethod" xsi:type="string">guest</data>
-            <data name="shippingAddress/dataset" xsi:type="string">UK_address</data>
+            <data name="checkoutMethod" xsi:type="string">login</data>
+            <data name="shippingAddress/dataset" xsi:type="string">UK_address_without_email</data>
             <data name="billingAddress/dataset" xsi:type="string">UK_address_2_without_email</data>
             <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
             <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
@@ -212,6 +212,7 @@
             <data name="configData" xsi:type="string">banktransfer_specificcountry_gb</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
             <constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
+            <constraint name="Magento\Customer\Test\Constraint\AssertCustomerDefaultAddressFrontendAddressBook" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
         </variation>
         <variation name="OnePageCheckoutTestVariation10" summary="One Page Checkout with all product types">
@@ -232,6 +233,7 @@
             </data>
             <data name="payment/method" xsi:type="string">checkmo</data>
             <data name="configData" xsi:type="string">checkmo</data>
+            <constraint name="Magento\Customer\Test\Constraint\AssertCustomerDefaultAddressFrontendAddressBook" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
         </variation>
         <variation name="OnePageCheckoutUsingSingInLink" summary="Login during checkout using 'Sign In' link" ticketId="MAGETWO-42547">

dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddressFrontendAddressBook.php

@@ -6,9 +6,10 @@
 
 namespace Magento\Customer\Test\Constraint;
 
+use Magento\Customer\Test\Block\Address\Renderer;
 use Magento\Customer\Test\Fixture\Address;
-use Magento\Customer\Test\Page\CustomerAccountIndex;
 use Magento\Customer\Test\Page\CustomerAccountAddress;
+use Magento\Customer\Test\Page\CustomerAccountIndex;
 use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -20,25 +21,32 @@ class AssertCustomerDefaultAddressFrontendAddressBook extends AbstractConstraint
      * Asserts that Default Billing Address and Default Shipping Address equal to data from fixture.
      *
      * @param CustomerAccountIndex $customerAccountIndex
-     * @param CustomerAccountAddress $customerAccountAddress
-     * @param Address $address
+     * @param CustomerAccountAddress $customerAddress
+     * @param Address|null $shippingAddress
+     * @param Address|null $billingAddress
      * @return void
      */
     public function processAssert(
         CustomerAccountIndex $customerAccountIndex,
-        CustomerAccountAddress $customerAccountAddress,
-        Address $address
+        CustomerAccountAddress $customerAddress,
+        Address $shippingAddress,
+        Address $billingAddress = null
     ) {
+        $customerAccountIndex->open();
         $customerAccountIndex->getAccountMenuBlock()->openMenuItem('Address Book');
-        $addressRenderer = $this->objectManager->create(
-            \Magento\Customer\Test\Block\Address\Renderer::class,
-            ['address' => $address, 'type' => 'html']
-        );
-        $addressToVerify = $addressRenderer->render();
+
+        $shippingAddressRendered = $this->createAddressRenderer($shippingAddress)->render();
+        $validated =
+            $shippingAddressRendered == $customerAddress->getDefaultAddressBlock()->getDefaultShippingAddress();
+
+        if (null !== $billingAddress) {
+            $billingAddressRendered = $customerAddress->getDefaultAddressBlock()->getDefaultBillingAddress();
+            $validated =
+                $validated && ($billingAddressRendered == $this->createAddressRenderer($billingAddress)->render());
+        }
 
         \PHPUnit_Framework_Assert::assertTrue(
-            $addressToVerify == $customerAccountAddress->getDefaultAddressBlock()->getDefaultBillingAddress()
-            && $addressToVerify == $customerAccountAddress->getDefaultAddressBlock()->getDefaultShippingAddress(),
+            $validated,
             'Customer default address on address book tab is not matching the fixture.'
         );
     }
@@ -52,4 +60,18 @@ public function toString()
     {
         return 'Default billing and shipping address form is correct.';
     }
+
+    /**
+     * Instantiate Renderer object.
+     *
+     * @param Address $address
+     * @return Renderer
+     */
+    private function createAddressRenderer(Address $address)
+    {
+        return $this->objectManager->create(
+            Renderer::class,
+            ['address' => $address, 'type' => 'html']
+        );
+    }
 }

dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php

@@ -156,6 +156,10 @@ public function test(
         $this->customerAddressEdit->getEditForm()->fill($address);
         $this->customerAddressEdit->getEditForm()->saveAddress();
 
-        return ['customer' => $this->prepareCustomer($customer, $initialCustomer)];
+        return [
+            'customer' => $this->prepareCustomer($customer, $initialCustomer),
+            'shippingAddress' => $address,
+            'billingAddress' => $address
+        ];
     }
 }