MAGETWO-70996: [GitHub] Customer Address "default billing address" Attribute Not Used in Checkout #8777

# Conflicts:
#	app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml
#	app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
#	app/code/Magento/Checkout/Test/Mftf/Test/DefaultBillingAddressShouldBeCheckedOnPaymentPageTest.xml
#	app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
#	app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js

Author: ysapiga

app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml

@@ -87,7 +87,6 @@
         <waitForPageLoad stepKey="waitForPageLoad10"/>
         <click selector="{{BraintreeConfigurationPaymentSection.paymentMethod}}" stepKey="SelectBraintreePaymentMethod1"/>
         <waitForPageLoad stepKey="waitForPageLoad11"/>
-        <waitForPageLoad stepKey="waitForPageLoad12"/>
         <!--Place order-->
         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="PlaceOrder1"/>
         <waitForPageLoad stepKey="waitForPageLoad13"/>

app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml

@@ -54,6 +54,7 @@
         <element name="addressBook" type="button" selector="//a[text()='Address Book']"/>
         <element name="noQuotes" type="text" selector=".no-quotes-block"/>
         <element name="paymentMethodByName" type="text" selector="//*[@id='checkout-payment-method-load']//*[contains(@class, 'payment-group')]//label[normalize-space(.)='{{var1}}']" parameterized="true"/>
-        <element name="billingAddressSelect" type="select" selector="select[name='billing_address_id']"/>
+        <element name="billingAddressSelect" type="select" selector=".payment-method._active select[name='billing_address_id']"/>
+        <element name="billingAddressSelectShared" type="select" selector=".checkout-billing-address select[name='billing_address_id']"/>
     </section>
 </sections>

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml

@@ -256,8 +256,7 @@
 
         <!-- Fill UK Address and verify that payment available and checkout successful -->
         <uncheckOption selector="{{StorefrontCheckoutPaymentMethodSection.billingAddressSameAsShippingShared}}" stepKey="uncheckBillingAddressSameAsShippingCheckCheckBox"/>
-        <click selector="{{CheckoutShippingSection.addressDropdown}}" stepKey="clickOnAddressDropDown"/>
-        <selectOption selector="{{CheckoutPaymentSection.billingAddressSelect}}" userInput="New Address" stepKey="clickOnNewAddress"/>
+        <selectOption selector="{{CheckoutPaymentSection.billingAddressSelectShared}}" userInput="New Address" stepKey="clickOnNewAddress"/>
         <waitForPageLoad stepKey="waitNewAddressBillingForm"/>
         <actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="changeAddress">
             <argument name="Address" value="updateCustomerUKAddress"/>

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

@@ -170,7 +170,9 @@ public function run()
      */
     private function getDefaultBillingAddress()
     {
-        $addresses = $this->customer->getDataFieldConfig('address')['source']->getAddresses();
+        $addresses = $this->customer->hasData('address')
+            ? $this->customer->getDataFieldConfig('address')['source']->getAddress()
+            : [];
         $defaultAddress = null;
         foreach ($addresses as $address) {
             if ($address->getDefaultBilling() === 'Yes') {