MAGETWO-59837: Stabilization for ported Vault and Braintree changes

- Fix Conflict Resolution test

Author: viktym

dev/tests/functional/tests/app/Magento/Backend/Test/Block/Messages.php

@@ -66,6 +66,19 @@ public function waitSuccessMessage()
         return $this->waitForElementVisible($this->successMessage, Locator::SELECTOR_CSS);
     }
 
+    /**
+     * Wait for success message and refresh page.
+     *
+     * @return bool
+     */
+    public function waitSuccessMessageAndRefreshPage()
+    {
+        $this->waitSuccessMessage();
+        $this->browser->refresh();
+
+        return $this->waitForElementNotVisible($this->successMessage, Locator::SELECTOR_CSS);
+    }
+
     /**
      * Get all success messages which are present on the page.
      *

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

@@ -120,7 +120,7 @@ private function enableBraintree()
         $this->braintreeConfigBlock->enableBraintree();
         $this->assertFieldsAreActive->processAssert($this->systemConfigEditSectionPayment, $enablers);
         $this->systemConfigEditSectionPayment->getPageActions()->save();
-        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessage();
+        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessageAndRefreshPage();
     }
 
     /**
@@ -140,6 +140,6 @@ private function disableBraintree()
         $this->braintreeConfigBlock->disableBraintree();
         $this->assertFieldsAreActive->processAssert($this->systemConfigEditSectionPayment, $enablers);
         $this->systemConfigEditSectionPayment->getPageActions()->save();
-        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessage();
+        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessageAndRefreshPage();
     }
 }

dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckExpressConfigStep.php

@@ -134,7 +134,7 @@ private function enableExpressCheckout()
         );
         $this->expressCheckoutConfigBlock->specifyMerchantAccountId();
         $this->systemConfigEditSectionPayment->getPageActions()->save();
-        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessage();
+        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessageAndRefreshPage();
     }
 
     /**
@@ -154,6 +154,6 @@ private function disableExpressCheckout()
             [$enablers['Enable In-Context Checkout Experience'], $enablers['Enable PayPal Credit']]
         );
         $this->systemConfigEditSectionPayment->getPageActions()->save();
-        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessage();
+        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessageAndRefreshPage();
     }
 }

dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowLinkConfigStep.php

@@ -137,7 +137,7 @@ private function enablePayflowLink()
             $enablers
         );
         $this->systemConfigEditSectionPayment->getPageActions()->save();
-        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessage();
+        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessageAndRefreshPage();
     }
 
     /**
@@ -160,6 +160,6 @@ private function disablePayflowLink()
             [$enablers['Enable Express Checkout'], $enablers['Enable PayPal Credit']]
         );
         $this->systemConfigEditSectionPayment->getPageActions()->save();
-        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessage();
+        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessageAndRefreshPage();
     }
 }

dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php

@@ -137,7 +137,7 @@ private function enablePayflowPro()
             [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit']]
         );
         $this->systemConfigEditSectionPayment->getPageActions()->save();
-        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessage();
+        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessageAndRefreshPage();
     }
 
     /**
@@ -160,6 +160,6 @@ private function disablePayflowPro()
             [$enablers['Enable PayPal Credit']]
         );
         $this->systemConfigEditSectionPayment->getPageActions()->save();
-        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessage();
+        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessageAndRefreshPage();
     }
 }

dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsAdvancedConfigStep.php

@@ -130,7 +130,7 @@ private function enablePaymentsAdvanced()
             [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit']]
         );
         $this->systemConfigEditSectionPayment->getPageActions()->save();
-        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessage();
+        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessageAndRefreshPage();
     }
 
     /**
@@ -150,6 +150,6 @@ private function disablePaymentsAdvanced()
             [$enablers['Enable PayPal Credit']]
         );
         $this->systemConfigEditSectionPayment->getPageActions()->save();
-        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessage();
+        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessageAndRefreshPage();
     }
 }

dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php

@@ -137,7 +137,7 @@ private function enablePaymentsPro()
             [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit']]
         );
         $this->systemConfigEditSectionPayment->getPageActions()->save();
-        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessage();
+        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessageAndRefreshPage();
     }
 
     /**
@@ -160,6 +160,6 @@ private function disablePaymentsPro()
             [$enablers['Enable PayPal Credit']]
         );
         $this->systemConfigEditSectionPayment->getPageActions()->save();
-        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessage();
+        $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessageAndRefreshPage();
     }
 }