Merge remote-tracking branch 'origin/MAGETWO-64297' into 2.1.8-develop-pr11

Author: OlgaVasyltsun

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

@@ -105,6 +105,7 @@ class Totals extends Block
      */
     public function getGrandTotal()
     {
+        $this->waitForUpdatedTotals();
         $grandTotal = $this->_rootElement->find($this->grandTotal, Locator::SELECTOR_CSS)->getText();
         return $this->escapeCurrency($grandTotal);
     }

dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertDiscountInShoppingCart.php

@@ -8,6 +8,7 @@
 
 use Magento\Checkout\Test\Fixture\Cart;
 use Magento\Checkout\Test\Page\CheckoutCart;
+use Magento\Customer\Test\Fixture\Customer;
 use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -20,19 +21,29 @@ class AssertDiscountInShoppingCart extends AbstractConstraint
     /**
      * Assert that discount is equal to expected.
      *
+     * @param Customer $customer
      * @param CheckoutCart $checkoutCart
      * @param Cart $cart
      * @return void
      */
-    public function processAssert(CheckoutCart $checkoutCart, Cart $cart)
-    {
+    public function processAssert(
+        Customer $customer,
+        CheckoutCart $checkoutCart,
+        Cart $cart
+    ) {
+        $loginStep = $this->objectManager->create(
+            \Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep::class,
+            ['customer' => $customer]
+        );
+        $loginStep->run();
         $checkoutCart->open();
         $checkoutCart->getTotalsBlock()->waitForUpdatedTotals();
         \PHPUnit_Framework_Assert::assertEquals(
             number_format($cart->getDiscount(), 2),
             $checkoutCart->getTotalsBlock()->getDiscount(),
             'Discount amount in the shopping cart not equals to discount amount from fixture.'
         );
+        $loginStep->cleanUp();
     }
 
     /**