MAGETWO-65656: [Backport] - When logged in customer edits a new shipping address during checkout they are unable to place the order - for 2.1

- MAGETWO-70727: [GitHub] Shipping method randomly dissapear when page refreshed for 2.1 #7497

Author: DianaRusin

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

@@ -8,7 +8,10 @@
 
 use Magento\Checkout\Test\Page\CheckoutOnepage;
 use Magento\Customer\Test\Fixture\Address;
+use Magento\Mtf\Fixture\FixtureFactory;
 use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Customer\Test\Fixture\Customer;
+use Magento\Mtf\ObjectManager;
 
 /**
  * Fill shipping address step.
@@ -20,37 +23,109 @@ class FillShippingAddressStep implements TestStepInterface
      *
      * @var CheckoutOnepage
      */
-    protected $checkoutOnepage;
+    private $checkoutOnepage;
 
     /**
      * Address fixture.
      *
      * @var Address
      */
-    protected $shippingAddress;
+    private $shippingAddress;
+
+    /**
+     * Customer fixture.
+     *
+     * @var Customer
+     */
+    private $customer;
+
+    /**
+     * Customer shipping address data for select.
+     *
+     * @var array
+     */
+    private $shippingAddressCustomer;
+
+    /**
+     * Object manager instance.
+     *
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * Fixture factory.
+     *
+     * @var FixtureFactory
+     */
+    private $fixtureFactory;
 
     /**
      * @constructor
      * @param CheckoutOnepage $checkoutOnepage
-     * @param Address $shippingAddress
+     * @param Customer $customer
+     * @param ObjectManager $objectManager
+     * @param FixtureFactory $fixtureFactory
+     * @param Address|null $shippingAddress
+     * @param array|null $shippingAddressCustomer
      */
     public function __construct(
         CheckoutOnepage $checkoutOnepage,
-        Address $shippingAddress = null
+        Customer $customer,
+        ObjectManager $objectManager,
+        FixtureFactory $fixtureFactory,
+        Address $shippingAddress = null,
+        $shippingAddressCustomer = null
     ) {
         $this->checkoutOnepage = $checkoutOnepage;
+        $this->customer = $customer;
+        $this->objectManager = $objectManager;
+        $this->fixtureFactory = $fixtureFactory;
         $this->shippingAddress = $shippingAddress;
+        $this->shippingAddressCustomer = $shippingAddressCustomer;
     }
 
     /**
      * Fill shipping address.
      *
-     * @return void
+     * @return array
      */
     public function run()
     {
+        $shippingAddress = null;
         if ($this->shippingAddress) {
-            $this->checkoutOnepage->getShippingBlock()->fill($this->shippingAddress);
+            $shippingBlock = $this->checkoutOnepage->getShippingBlock();
+            if ($shippingBlock->isPopupNewAddressButtonVisible()) {
+                $shippingBlock->clickPopupNewAddressButton();
+                $this->checkoutOnepage->getShippingAddressPopupBlock()
+                    ->fill($this->shippingAddress)
+                    ->clickSaveAddressButton();
+            } else {
+                $shippingBlock->fill($this->shippingAddress);
+            }
+            $shippingAddress = $this->shippingAddress;
+        }
+        if (isset($this->shippingAddressCustomer['new'])) {
+            $shippingAddress = $this->fixtureFactory->create(
+                'address',
+                ['dataset' => $this->shippingAddressCustomer['new']]
+            );
+            $this->checkoutOnepage->getShippingBlock()->clickPopupNewAddressButton();
+            $this->checkoutOnepage->getShippingAddressPopupBlock()->fill($shippingAddress)->clickSaveAddressButton();
         }
+        if (isset($this->shippingAddressCustomer['added'])) {
+            $addressIndex = $this->shippingAddressCustomer['added'];
+            $shippingAddress = $this->customer->getDataFieldConfig('address')['source']->getAddresses()[$addressIndex];
+            $address = $this->objectManager->create(
+                \Magento\Customer\Test\Block\Address\Renderer::class,
+                ['address' => $shippingAddress, 'type' => 'html_without_company']
+            )->render();
+            $shippingBlock = $this->checkoutOnepage->getShippingBlock();
+            $shippingBlock->selectAddress($address);
+        }
+
+        return [
+            'shippingAddress' => $shippingAddress,
+        ];
     }
 }

dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesAdditional.php

@@ -62,7 +62,7 @@ public function deleteAdditionalAddress(Address $address)
             ->find($this->deleteAddressLink)->click();
         $element = $this->browser->find($this->confirmModal);
         /** @var \Magento\Ui\Test\Block\Adminhtml\Modal $modal */
-        $modal = $this->blockFactory->create('Magento\Ui\Test\Block\Adminhtml\Modal', ['element' => $element]);
+        $modal = $this->blockFactory->create(\Magento\Ui\Test\Block\Adminhtml\Modal::class, ['element' => $element]);
         $modal->acceptAlert();
     }