Merge remote-tracking branch 'mpi/MAGETWO-52478' into MPI-PR-3005

Author: oshmyheliuk

dev/tests/functional/tests/app/Magento/Braintree/Test/Block/Paypal/PopupWindow.php

@@ -40,22 +40,15 @@ public function waitForFormLoaded()
     /**
      * Process PayPal auth flow
      *
-     * @return void
+     * @param null|string $parentWindow
+     * 
      */
-    public function process()
+    public function process($parentWindow = null)
     {
         $this->browser->selectWindow();
         $this->waitForFormLoaded();
         $this->browser->find($this->submitButton)->click();
-        /**
-         * This try/catch is intended as workaround in case if popup window is closed instantly and #login-preview
-         * selector cannot be found.
-         */
-        try {
-            $this->waitForElementNotVisible($this->selector);
-        } catch (\PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
-        }
-        $this->browser->selectWindow();
+        $this->browser->selectWindow($parentWindow);
         $this->waitForElementNotVisible($this->loader);
     }
 }

dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CheckoutWithPaypalFromCartStep.php

@@ -37,8 +37,9 @@ public function __construct(CheckoutCart $checkoutCart)
     public function run()
     {
         $this->checkoutCart->open();
-        $this->checkoutCart->getCartBlock()
+        $this->checkoutCart->getTotalsBlock()->waitForUpdatedTotals();
+        $currentWindow = $this->checkoutCart->getCartBlock()
             ->braintreePaypalCheckout();
-        $this->checkoutCart->getBraintreePaypalBlock()->process();
+        $this->checkoutCart->getBraintreePaypalBlock()->process($currentWindow);
     }
 }

dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CheckoutWithPaypalFromMinicartStep.php

@@ -61,7 +61,7 @@ public function run()
     {
         $product = reset($this->products);
         $this->browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
-        $this->catalogProductView->getViewBlock()->braintreePaypalCheckout();
-        $this->catalogProductView->getBraintreePaypalBlock()->process();
+        $parentWindow = $this->catalogProductView->getViewBlock()->braintreePaypalCheckout();
+        $this->catalogProductView->getBraintreePaypalBlock()->process($parentWindow);
     }
 }

dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/PlaceOrderWithPaypalStep.php

@@ -78,8 +78,11 @@ public function run()
         if (isset($this->prices['grandTotal'])) {
             $this->assertGrandTotalOrderReview->processAssert($this->checkoutOnepage, $this->prices['grandTotal']);
         }
-        $this->checkoutOnepage->getPaymentBlock()->getSelectedPaymentMethodBlock()->clickPlaceOrder();
-        $this->checkoutOnepage->getBraintreePaypalBlock()->process();
+        $parentWindow = $this->checkoutOnepage->getPaymentBlock()
+            ->getSelectedPaymentMethodBlock()
+            ->clickContinueToPaypal();
+        $this->checkoutOnepage->getBraintreePaypalBlock()->process($parentWindow);
+        
         $order = $this->fixtureFactory->createByCode(
             'orderInjectable',
             [

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php

@@ -302,11 +302,12 @@ public function inContextPaypalCheckout()
 
     /**
      * Press 'Check out with Braintree PayPal' button.
-     *
-     * @return void
+     * 
+     * @return string
      */
     public function braintreePaypalCheckout()
     {
+        $currentWindow = $this->browser->getCurrentWindow();
         /** @var \Magento\Checkout\Test\Block\Cart\Sidebar $miniCart */
         $miniCart = $this->blockFactory->create(
             '\Magento\Checkout\Test\Block\Cart\Sidebar',
@@ -315,6 +316,7 @@ public function braintreePaypalCheckout()
 
         $miniCart->openMiniCart();
         $miniCart->clickBraintreePaypalButton();
+        return $currentWindow;
     }
 
     /**

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

@@ -152,12 +152,14 @@ public function getOnepageLinkBlock()
     /**
      * Click "Check out with Braintree PayPal" button.
      *
-     * @return void
+     * @return string
      */
     public function braintreePaypalCheckout()
     {
+        $currentWindow = $this->browser->getCurrentWindow();
         $this->_rootElement->find($this->braintreePaypalCheckoutButton, Locator::SELECTOR_XPATH)
             ->click();
+        return $currentWindow;
     }
 
     /**

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

@@ -247,8 +247,7 @@ public function isVisibleShippingPriceBlock()
      */
     public function waitForUpdatedTotals()
     {
-        // Code under may use JavaScript delay at this point as well.
-        sleep(1);
+        $this->waitForElementVisible($this->blockWaitElement);
         $this->waitForElementNotVisible($this->blockWaitElement);
     }
 

dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Method.php

@@ -70,6 +70,19 @@ public function clickPlaceOrder()
         $this->waitForElementNotVisible($this->waitElement);
     }
 
+    /**
+     * Click Continue to Paypal button.
+     *
+     * @return string
+     */
+    public function clickContinueToPaypal()
+    {
+        $currentWindow = $this->browser->getCurrentWindow();
+        $this->_rootElement->find($this->placeOrderButton)->click();
+        $this->waitForElementNotVisible($this->waitElement);
+        return $currentWindow;
+    }
+    
     /**
      * Click "Check out with PayPal" button.
      */