MTA-1602: Sync qmt repository with mainline - Sprint 6

Author: Dmytro Aponasenko

dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceType.php

@@ -79,6 +79,8 @@ protected function assertPrice(
             ? $originalProduct->getPriceType()
             : $product->getPriceType();
         $catalogProductView->getViewBlock()->addToCart($product);
+        $catalogProductView->getMessagesBlock()->waitSuccessMessage();
+        $checkoutCartView->open();
         $cartItem = $checkoutCartView->getCartBlock()->getCartItem($product);
         $specialPrice = 0;
         if (isset($bundleData['group_price'])) {

dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAbsentCrossSells.php

@@ -50,6 +50,8 @@ public function processAssert(
 
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
         $catalogProductView->getViewBlock()->addToCart($product);
+        $catalogProductView->getMessagesBlock()->waitSuccessMessage();
+        $checkoutCart->open();
         foreach ($promotedProducts as $promotedProduct) {
             \PHPUnit_Framework_Assert::assertFalse(
                 $checkoutCart->getCrosssellBlock()->getProductItem($promotedProduct)->isVisible(),

dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCrossSells.php

@@ -51,6 +51,8 @@ public function processAssert(
 
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
         $catalogProductView->getViewBlock()->addToCart($product);
+        $catalogProductView->getMessagesBlock()->waitSuccessMessage();
+        $checkoutCart->open();
         foreach ($promotedProducts as $promotedProduct) {
             if (!$checkoutCart->getCrosssellBlock()->getProductItem($promotedProduct)->isVisible()) {
                 $errors[] = 'Product \'' . $promotedProduct->getName() . '\' is absent in cross-sell section.';

dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCart.php

@@ -42,6 +42,7 @@ public function processAssert(
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
         $catalogProductView->getViewBlock()->fillOptions($product);
         $catalogProductView->getViewBlock()->clickAddToCart();
+        $catalogProductView->getMessagesBlock()->waitSuccessMessage();
 
         // Check price
         $this->assertOnShoppingCart($product, $checkoutCart);
@@ -56,6 +57,7 @@ public function processAssert(
      */
     protected function assertOnShoppingCart(FixtureInterface $product, CheckoutCart $checkoutCart)
     {
+        $checkoutCart->open();
         /** @var CatalogProductSimple $product */
         $customOptions = $product->getCustomOptions();
         $checkoutData = $product->getCheckoutData();

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddToCartCrossSellTest.php

@@ -11,8 +11,6 @@
 use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
- * Test Flow:
- *
  * Preconditions:
  * 1. Create products.
  * 2. Assign promoted products.
@@ -84,6 +82,7 @@ public function test(
 
         $this->browser->open($_ENV['app_frontend_url'] . $initialProduct->getUrlKey() . '.html');
         $this->catalogProductView->getViewBlock()->addToCart($initialProduct);
+        $this->catalogProductView->getMessagesBlock()->waitSuccessMessage();
         $this->assertCrossSellSection($initialProductToVerify);
         foreach ($navigateProductsOrder as $productName) {
             $this->addToCart($this->products[$productName]);
@@ -109,7 +108,7 @@ protected function addToCart(InjectableFixture $product)
             $this->catalogProductView->getViewBlock()->addToCart($product);
         }
 
-        $this->checkoutCart->getMessagesBlock()->waitSuccessMessage();
+        $this->catalogProductView->getMessagesBlock()->waitSuccessMessage();
     }
 
     /**
@@ -119,6 +118,7 @@ protected function addToCart(InjectableFixture $product)
      */
     protected function assertAbsentCrossSellSection()
     {
+        $this->checkoutCart->open();
         \PHPUnit_Framework_Assert::assertFalse(
             $this->checkoutCart->getCrosssellBlock()->isVisible(),
             "Cross-sell block is present."
@@ -139,6 +139,7 @@ protected function assertCrossSellSection(array $promotedProductNames)
         foreach ($promotedProductNames as $promotedProductName) {
             $productNames[] = $this->products[$promotedProductName]->getName();
         }
+        $this->checkoutCart->open();
         foreach ($this->checkoutCart->getCrosssellBlock()->getProducts() as $productItem) {
             $pageProductNames[] = $productItem->getProductName();
         }

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateRelatedProductsTest.php

@@ -10,8 +10,6 @@
 use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
- * Test Flow:
- *
  * Preconditions:
  * 1. Create products.
  * 2. Assign promoted products.
@@ -102,6 +100,7 @@ public function test(
         $checkoutProducts = $this->selectRelatedProducts($lastProductName);
         $checkoutProducts[] = $lastProduct;
         $this->catalogProductView->getViewBlock()->addToCart($lastProduct);
+        $this->catalogProductView->getMessagesBlock()->waitSuccessMessage();
         $this->assertCheckoutCart($checkoutProducts);
     }
 

dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.php

@@ -15,9 +15,6 @@
 use Magento\Mtf\TestCase\Injectable;
 
 /**
- * Class DeleteProductsFromShoppingCartTest
- * Test delete products from shopping cart
- *
  * Preconditions
  * 1. Test products are created
  *
@@ -141,6 +138,7 @@ protected function addToCart(array $products)
      */
     protected function removeProducts(array $products)
     {
+        $this->cartPage->open();
         foreach ($products as $product) {
             $this->cartPage->getCartBlock()->getCartItem($product)->removeItem();
         }

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

@@ -13,7 +13,6 @@
 use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
- * Class AddProductsToTheCartStep
  * Adding created products to the cart
  */
 class AddProductsToTheCartStep implements TestStepInterface
@@ -88,6 +87,7 @@ public function run()
         foreach ($this->products as $product) {
             $this->browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
             $this->catalogProductView->getViewBlock()->addToCart($product);
+            $this->catalogProductView->getMessagesBlock()->waitSuccessMessage();
         }
     }
 }

dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCart.php

@@ -36,6 +36,8 @@ public function processAssert(
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
 
         $catalogProductView->getViewBlock()->addToCart($product);
+        $catalogProductView->getMessagesBlock()->waitSuccessMessage();
+        $checkoutCart->open();
 
         $checkoutData = $product->getCheckoutData();
         $price = $checkoutCart->getCartBlock()->getCartItem($product)->getPrice();

dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.php

@@ -13,9 +13,7 @@
 use Magento\Mtf\TestCase\Injectable;
 
 /**
- * Test Creation for Create DownloadableProductEntity
- *
- * Test Flow:
+ * Steps:
  * 1. Log in to Backend.
  * 2. Navigate to Products > Catalog.
  * 3. Start to create new Downloadable product.