Merge remote-tracking branch 'origin/MAGETWO-95963' into 2.2.7-develop-pr53

zakdma · zakdma · commit 2951789f8d6b · 2018-10-29T11:44:06.000+02:00
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
@@ -120,6 +120,7 @@
 
         <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask3"/>
+        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
         <fillField selector="{{OrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
         <click selector="{{OrdersGridSection.submitSearch}}" stepKey="submitSearch"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>
@@ -176,4 +177,4 @@
         <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
         <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
     </test>
-</tests>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle.xml
@@ -65,6 +65,7 @@
         <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
         <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
         <fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
         <click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml
@@ -63,6 +63,7 @@
 
         <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnOrdersPage"/>
+        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
         <fillField selector="{{OrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
         <click selector="{{OrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
@@ -61,6 +61,7 @@
 
         <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onAdminOrdersPage"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask3"/>
+        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
         <fillField selector="{{OrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="searchOrderNum"/>
         <click selector="{{OrdersGridSection.submitSearch}}" stepKey="submitSearch"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductOnConfigureCartPage.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductOnConfigureCartPage.php
@@ -8,6 +8,7 @@
 
 use Magento\Bundle\Test\Fixture\BundleProduct;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
+use Magento\Checkout\Test\Constraint\Utils\CartPageLoadTrait;
 use Magento\Checkout\Test\Fixture\Cart;
 use Magento\Checkout\Test\Page\CheckoutCart;
 use Magento\Mtf\Constraint\AbstractAssertForm;
@@ -17,6 +18,8 @@
  */
 class AssertBundleProductOnConfigureCartPage extends AbstractAssertForm
 {
+    use CartPageLoadTrait;
+
     /**
      * Check bundle product options correctly displayed on cart configuration page.
      *
@@ -28,6 +31,8 @@ class AssertBundleProductOnConfigureCartPage extends AbstractAssertForm
     public function processAssert(CheckoutCart $checkoutCart, Cart $cart, CatalogProductView $catalogProductView)
     {
         $checkoutCart->open();
+        $this->waitForCartPageLoaded($checkoutCart);
+
         $sourceProducts = $cart->getDataFieldConfig('items')['source'];
         $products = $sourceProducts->getProducts();
         foreach ($cart->getItems() as $key => $item) {
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php
@@ -113,6 +113,13 @@ class Cart extends Block
      */
     private $popupWindowContent = '#main';
 
+    /**
+     * Locator for page with ajax loading state.
+     *
+     * @var string
+     */
+    private $ajaxLoading = 'body.ajax-loading';
+
     /**
      * Wait for PayPal page is loaded.
      *
@@ -295,4 +302,14 @@ public function waitForCheckoutButton()
     {
         $this->waitForElementVisible($this->inContextPaypalCheckoutButton);
     }
+
+    /**
+     * Wait loading.
+     *
+     * @return void
+     */
+    public function waitForLoader()
+    {
+        $this->waitForElementNotVisible($this->ajaxLoading);
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php
@@ -72,6 +72,13 @@ class Shipping extends Form
      */
     protected $commonShippingPriceSelector = '.totals.shipping .price';
 
+    /**
+     * Estimate shipping and tax form locator.
+     *
+     * @var string
+     */
+    private $estimateShippingForm = '#shipping-zip-form';
+
     /**
      * Open estimate shipping and tax form.
      *
@@ -250,4 +257,51 @@ public function waitForCommonShippingPriceBlock()
     {
         $this->waitForElementVisible($this->commonShippingPriceSelector, Locator::SELECTOR_CSS);
     }
+
+    /**
+     * Wait until estimation form to appear.
+     *
+     * @return void
+     */
+    public function waitForEstimateShippingAndTaxForm()
+    {
+        $browser = $this->browser;
+        $selector = $this->estimateShippingForm;
+
+        $browser->waitUntil(
+            function () use ($browser, $selector) {
+                $element = $browser->find($selector);
+                return $element->isPresent() ? true : null;
+            }
+        );
+    }
+
+    /**
+     * Wait for shipping method form.
+     *
+     * @return void
+     */
+    public function waitForShippingMethodForm()
+    {
+        $browser = $this->browser;
+        $selector = $this->shippingMethodForm;
+
+        $browser->waitUntil(
+            function () use ($browser, $selector) {
+                $element = $browser->find($selector);
+                return $element->isPresent() ? true : null;
+            }
+        );
+    }
+
+    /**
+     * Wait for summary block to be loaded.
+     *
+     * @return void
+     */
+    public function waitForSummaryBlock()
+    {
+        $this->waitForEstimateShippingAndTaxForm();
+        $this->waitForShippingMethodForm();
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php
@@ -264,4 +264,15 @@ public function waitForShippingPriceBlock()
     {
         $this->waitForElementVisible($this->shippingPriceBlockSelector, Locator::SELECTOR_CSS);
     }
+
+    /**
+     * Wait for "Grand Total" row to appear.
+     *
+     * @return void
+     */
+    public function waitForGrandTotal()
+    {
+        $this->waitForUpdatedTotals();
+        $this->waitForElementVisible($this->grandTotal);
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartItemsOptions.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartItemsOptions.php
@@ -7,6 +7,7 @@
 namespace Magento\Checkout\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+use Magento\Checkout\Test\Constraint\Utils\CartPageLoadTrait;
 use Magento\Checkout\Test\Fixture\Cart;
 use Magento\Checkout\Test\Fixture\Cart\Items;
 use Magento\Checkout\Test\Page\CheckoutCart;
@@ -21,6 +22,8 @@
  */
 class AssertCartItemsOptions extends AbstractAssertForm
 {
+    use CartPageLoadTrait;
+
     /**
      * Error message for verify options
      *
@@ -44,6 +47,8 @@ class AssertCartItemsOptions extends AbstractAssertForm
     public function processAssert(CheckoutCart $checkoutCart, Cart $cart)
     {
         $checkoutCart->open();
+        $this->waitForCartPageLoaded($checkoutCart);
+
         /** @var Items $sourceProducts */
         $sourceProducts = $cart->getDataFieldConfig('items')['source'];
         $products = $sourceProducts->getProducts();
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalInShoppingCart.php
@@ -6,6 +6,7 @@
 
 namespace Magento\Checkout\Test\Constraint;
 
+use Magento\Checkout\Test\Constraint\Utils\CartPageLoadTrait;
 use Magento\Checkout\Test\Fixture\Cart;
 use Magento\Checkout\Test\Page\CheckoutCart;
 use Magento\Mtf\Constraint\AbstractConstraint;
@@ -16,6 +17,8 @@
  */
 class AssertGrandTotalInShoppingCart extends AbstractConstraint
 {
+    use CartPageLoadTrait;
+
     /**
      * Assert that grand total is equal to expected
      *
@@ -28,6 +31,7 @@ public function processAssert(CheckoutCart $checkoutCart, Cart $cart, $requireRe
     {
         if ($requireReload) {
             $checkoutCart->open();
+            $this->waitForCartPageLoaded($checkoutCart);
             $checkoutCart->getTotalsBlock()->waitForUpdatedTotals();
         }
 
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPriceInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPriceInShoppingCart.php
@@ -7,6 +7,7 @@
 namespace Magento\Checkout\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+use Magento\Checkout\Test\Constraint\Utils\CartPageLoadTrait;
 use Magento\Checkout\Test\Fixture\Cart;
 use Magento\Checkout\Test\Fixture\Cart\Items;
 use Magento\Checkout\Test\Page\CheckoutCart;
@@ -19,6 +20,8 @@
  */
 class AssertPriceInShoppingCart extends AbstractAssertForm
 {
+    use CartPageLoadTrait;
+
     /**
      * Assert that price in the shopping cart equals to expected price from data set
      *
@@ -29,6 +32,8 @@ class AssertPriceInShoppingCart extends AbstractAssertForm
     public function processAssert(CheckoutCart $checkoutCart, Cart $cart)
     {
         $checkoutCart->open();
+        $this->waitForCartPageLoaded($checkoutCart);
+
         /** @var Items $sourceProducts */
         $sourceProducts = $cart->getDataFieldConfig('items')['source'];
         $products = $sourceProducts->getProducts();
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInShoppingCart.php
@@ -7,6 +7,7 @@
 namespace Magento\Checkout\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+use Magento\Checkout\Test\Constraint\Utils\CartPageLoadTrait;
 use Magento\Checkout\Test\Fixture\Cart;
 use Magento\Checkout\Test\Fixture\Cart\Items;
 use Magento\Checkout\Test\Page\CheckoutCart;
@@ -19,6 +20,8 @@
  */
 class AssertProductQtyInShoppingCart extends AbstractAssertForm
 {
+    use CartPageLoadTrait;
+
     /**
      * Assert that quantity in the shopping cart is equals to expected quantity from data set
      *
@@ -29,6 +32,8 @@ class AssertProductQtyInShoppingCart extends AbstractAssertForm
     public function processAssert(CheckoutCart $checkoutCart, Cart $cart)
     {
         $checkoutCart->open();
+        $this->waitForCartPageLoaded($checkoutCart);
+
         /** @var Items $sourceProducts */
         $sourceProducts = $cart->getDataFieldConfig('items')['source'];
         $products = $sourceProducts->getProducts();
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubtotalInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubtotalInShoppingCart.php
@@ -7,6 +7,7 @@
 namespace Magento\Checkout\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+use Magento\Checkout\Test\Constraint\Utils\CartPageLoadTrait;
 use Magento\Checkout\Test\Fixture\Cart;
 use Magento\Checkout\Test\Fixture\Cart\Items;
 use Magento\Checkout\Test\Page\CheckoutCart;
@@ -19,6 +20,8 @@
  */
 class AssertSubtotalInShoppingCart extends AbstractAssertForm
 {
+    use CartPageLoadTrait;
+
     /**
      * Assert that subtotal total in the shopping cart is equals to expected total from data set
      *
@@ -31,6 +34,7 @@ public function processAssert(CheckoutCart $checkoutCart, Cart $cart, $requireRe
     {
         if ($requireReload) {
             $checkoutCart->open();
+            $this->waitForCartPageLoaded($checkoutCart);
         }
 
         /** @var Items $sourceProducts */
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/Utils/CartPageLoadTrait.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/Utils/CartPageLoadTrait.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Checkout\Test\Constraint\Utils;
+
+use Magento\Checkout\Test\Page\CheckoutCart;
+
+/**
+ * Check if cart page is fully loaded.
+ */
+trait CartPageLoadTrait
+{
+    /**
+     * @param CheckoutCart $checkoutCart
+     * @return void
+     */
+    public function waitForCartPageLoaded(CheckoutCart $checkoutCart)
+    {
+        $checkoutCart->getCartBlock()->waitForLoader();
+        if (!$checkoutCart->getCartBlock()->cartIsEmpty()) {
+            $checkoutCart->getShippingBlock()->waitForSummaryBlock();
+            $checkoutCart->getTotalsBlock()->waitForGrandTotal();
+        }
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php
@@ -115,6 +115,7 @@ public function test(
         } else {
             $miniShoppingCart->getCartItem($newProduct)->clickEditItem();
             $this->catalogProductView->getViewBlock()->addToCart($newProduct);
+            $this->catalogProductView->getMessagesBlock()->waitSuccessMessage();
         }
         // Prepare data for asserts:
         $cart['data']['items'] = ['products' => [$newProduct]];
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntityTest.php
@@ -102,10 +102,12 @@ public function test(
         $productUrl = $_ENV['app_frontend_url'] . $product->getUrlKey() . '.html';
         $browser->open($productUrl);
         $this->catalogProductView->getViewBlock()->addToCart($product);
+        $this->catalogProductView->getMessagesBlock()->waitSuccessMessage();
         if ($isGuest) {
             $this->objectManager->create(\Magento\Customer\Test\TestStep\LogoutCustomerOnFrontendStep::class)->run();
             $browser->open($productUrl);
             $this->catalogProductView->getViewBlock()->addToCart($product);
+            $this->catalogProductView->getMessagesBlock()->waitSuccessMessage();
         }
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveShoppingCartProductsOnOrderPageTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveShoppingCartProductsOnOrderPageTest.php
@@ -144,6 +144,7 @@ public function test(Customer $customer, $product)
         )->run();
         $this->browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
         $this->catalogProductView->getViewBlock()->addToCart($product);
+        $this->catalogProductView->getMessagesBlock()->waitSuccessMessage();
 
         //Steps
         $this->customerIndex->open();

Original file line number	Diff line number	Diff line change
`@@ -264,4 +264,15 @@ public function waitForShippingPriceBlock()`
`264`	`264`	`{`
`265`	`265`	`$this->waitForElementVisible($this->shippingPriceBlockSelector, Locator::SELECTOR_CSS);`
`266`	`266`	`}`
	`267`	`+`
	`268`	`+ /**`
	`269`	`+ * Wait for "Grand Total" row to appear.`
	`270`	`+ *`
	`271`	`+ * @return void`
	`272`	`+ */`
	`273`	`+ public function waitForGrandTotal()`
	`274`	`+ {`
	`275`	`+ $this->waitForUpdatedTotals();`
	`276`	`+ $this->waitForElementVisible($this->grandTotal);`
	`277`	`+ }`
`267`	`278`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace Magento\Checkout\Test\Constraint;`
`8`	`8`
	`9`	`+use Magento\Checkout\Test\Constraint\Utils\CartPageLoadTrait;`
`9`	`10`	`use Magento\Checkout\Test\Fixture\Cart;`
`10`	`11`	`use Magento\Checkout\Test\Page\CheckoutCart;`
`11`	`12`	`use Magento\Mtf\Constraint\AbstractConstraint;`
`@@ -16,6 +17,8 @@`
`16`	`17`	`*/`
`17`	`18`	`class AssertGrandTotalInShoppingCart extends AbstractConstraint`
`18`	`19`	`{`
	`20`	`+ use CartPageLoadTrait;`
	`21`	`+`
`19`	`22`	`/**`
`20`	`23`	`* Assert that grand total is equal to expected`
`21`	`24`	`*`
`@@ -28,6 +31,7 @@ public function processAssert(CheckoutCart $checkoutCart, Cart $cart, $requireRe`
`28`	`31`	`{`
`29`	`32`	`if ($requireReload) {`
`30`	`33`	`$checkoutCart->open();`
	`34`	`+ $this->waitForCartPageLoaded($checkoutCart);`
`31`	`35`	`$checkoutCart->getTotalsBlock()->waitForUpdatedTotals();`
`32`	`36`	`}`
`33`	`37`