Merge remote-tracking branch 'mpi/MAGETWO-52478' into MPI-PR-3005

Author: oshmyheliuk

dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CheckoutWithPaypalFromCartStep.php

@@ -37,6 +37,7 @@ public function __construct(CheckoutCart $checkoutCart)
     public function run()
     {
         $this->checkoutCart->open();
+        $this->checkoutCart->getTotalsBlock()->waitForShippingPriceBlock();
         $this->checkoutCart->getTotalsBlock()->waitForUpdatedTotals();
         $currentWindow = $this->checkoutCart->getCartBlock()
             ->braintreePaypalCheckout();

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

@@ -247,7 +247,8 @@ public function isVisibleShippingPriceBlock()
      */
     public function waitForUpdatedTotals()
     {
-        $this->waitForElementVisible($this->blockWaitElement);
+        // Code under may use JavaScript delay at this point as well.
+        sleep(1);
         $this->waitForElementNotVisible($this->blockWaitElement);
     }