MAGETWO-31159: Varnish coverage increase

- fix test after merge

Author: Michail Slabko

app/code/Magento/Checkout/Controller/Cart/EstimatePost.php

@@ -68,6 +68,7 @@ public function execute()
             ->setRegion($region)
             ->setCollectShippingRates(true);
         $this->quoteRepository->save($this->cart->getQuote());
+        $this->cart->save();
         return $this->_goBack();
     }
 }

app/code/Magento/Checkout/Controller/Cart/EstimateUpdatePost.php

@@ -16,6 +16,7 @@ public function execute()
         $code = (string)$this->getRequest()->getParam('estimate_method');
         if (!empty($code)) {
             $this->cart->getQuote()->getShippingAddress()->setShippingMethod($code)->save();
+            $this->cart->save();
         }
         return $this->_goBack();
     }

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

@@ -57,6 +57,13 @@ class Cart extends Block
      */
     protected $cartEmpty = '.cart-empty';
 
+    /**
+     * Cart container selector
+     *
+     * @var string
+     */
+    protected $cartContainer = '.cart-container';
+
     /**
      * Get cart item block
      *
@@ -170,4 +177,12 @@ public function cartIsEmpty()
     {
         return $this->_rootElement->find($this->cartEmpty, Locator::SELECTOR_CSS)->isVisible();
     }
+
+    /**
+     * Wait while cart container is loaded
+     */
+    public function waitCartContainerLoading()
+    {
+        $this->waitForElementVisible($this->cartContainer);
+    }
 }

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

@@ -106,7 +106,9 @@ public function __construct(
     public function run()
     {
         $this->checkoutCart->open();
+        $this->checkoutCart->getCartBlock()->waitCartContainerLoading();
         $this->checkoutCart->getShippingBlock()->fillEstimateShippingAndTax($this->address);
+        $this->checkoutCart->getCartBlock()->waitCartContainerLoading();
         if ($this->shipping['shipping_service'] !== '-') {
             $this->checkoutCart->getShippingBlock()->selectShippingMethod($this->shipping);
         }