MAGETWO-52478: CreateOnlineCreditMemoBraintreePaypalTest is failing on closing popup window

Author: rliukshyn

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/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/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.
      */