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

Author: Vadim Zubovich

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

@@ -295,5 +295,26 @@
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderAddresses" />
         </variation>
+        <variation name="OnePageCheckoutTestVariation11" summary="Checkout as Customer using default address" ticketId="MAGETWO-42600, MAGETWO-42546">
+            <data name="products/0" xsi:type="string">catalogProductSimple::default</data>
+            <data name="customer/dataset" xsi:type="string">customer_UK_US_addresses</data>
+            <data name="checkoutMethod" xsi:type="string">login</data>
+            <data name="shippingAddressCustomer" xsi:type="array">
+                <item name="added" xsi:type="number">0</item>
+            </data>
+            <data name="billingAddressCustomer" xsi:type="array">
+                <item name="added" xsi:type="number">0</item>
+            </data>
+            <data name="prices" xsi:type="array">
+                <item name="grandTotal" xsi:type="string">565.00</item>
+            </data>
+            <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+            <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+            <data name="payment/method" xsi:type="string">checkmo</data>
+            <data name="configData" xsi:type="string">checkmo_specificcountry_gb</data>
+            <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderAddresses" />
+        </variation>
     </testCase>
 </config>

dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Address.xml

@@ -240,5 +240,16 @@
             <field name="region_id" xsi:type="string">Berlin</field>
             <field name="telephone" xsi:type="string">333-33-333-33</field>
         </dataset>
+
+        <dataset name="customer_UK_US_addresses">
+            <field name="firstname" xsi:type="string">John</field>
+            <field name="lastname" xsi:type="string">Doe%isolation%</field>
+            <field name="email" xsi:type="string">John.Doe%isolation%@example.com</field>
+            <field name="password" xsi:type="string">123123^q</field>
+            <field name="password_confirmation" xsi:type="string">123123^q</field>
+            <field name="address" xsi:type="array">
+                <item name="dataset" xsi:type="string">UK_address_default_billing, US_address_default_shipping</item>
+            </field>
+        </dataset>
     </repository>
 </config>