Merge remote-tracking branch 'origin/MAGETWO-53784' into BUGS

Author: slavvka

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

@@ -58,6 +58,13 @@ class Shipping extends Form
      */
     protected $blockWaitElement = '._block-content-loading';
 
+    /**
+     * Get shipping price selector for exclude and include price
+     *
+     * @var string
+     */
+    protected $commonShippingPriceSelector = '.shipping .price';
+
     /**
      * Open estimate shipping and tax form.
      *
@@ -158,4 +165,14 @@ public function waitForUpdatedShippingMethods()
         sleep(1);
         $this->waitForElementNotVisible($this->blockWaitElement);
     }
+
+    /**
+     * Wait for common shipping price block to appear
+     *
+     * @return void
+     */
+    public function waitForCommonShippingPriceBlock()
+    {
+        $this->waitForElementVisible($this->commonShippingPriceSelector, Locator::SELECTOR_CSS);
+    }
 }