Merge remote-tracking branch 'origin/MAGETWO-70959' into 2.1.8-develop-pr24

Author: DianaRusin

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

@@ -86,6 +86,7 @@ public function openEstimateShippingAndTax()
      */
     public function selectShippingMethod(array $shipping)
     {
+        $this->waitForUpdatedShippingMethods();
         $selector = sprintf($this->shippingMethod, $shipping['shipping_service'], $shipping['shipping_method']);
         if (!$this->_rootElement->find($selector, Locator::SELECTOR_XPATH)->isVisible()) {
             $this->openEstimateShippingAndTax();

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

@@ -42,6 +42,18 @@ class Method extends Block
      */
     protected $blockWaitElement = '._block-content-loading';
 
+    /**
+     * Wait until shipping rates will appear.
+     *
+     * @return void
+     */
+    private function waitForShippingRates()
+    {
+        // Code under test uses JavaScript setTimeout at this point as well.
+        sleep(3);
+        $this->waitForElementNotVisible($this->blockWaitElement);
+    }
+
     /**
      * Select shipping method.
      *
@@ -50,20 +62,19 @@ class Method extends Block
      */
     public function selectShippingMethod(array $method)
     {
-        // Code under test uses JavaScript setTimeout at this point as well.
-        sleep(3);
+        $this->waitForShippingRates();
         $selector = sprintf($this->shippingMethod, $method['shipping_method'], $method['shipping_service']);
-        $this->waitForElementNotVisible($this->blockWaitElement);
         $this->_rootElement->find($selector, Locator::SELECTOR_XPATH)->click();
     }
 
     /**
-     * Click continue button
+     * Click continue button.
      *
      * @return void
      */
     public function clickContinue()
     {
+        $this->waitForShippingRates();
         $this->_rootElement->find($this->continue)->click();
         $browser = $this->browser;
         $selector = $this->waitElement;