From 245507f821fb65878784746a73bba5ca921857dd Mon Sep 17 00:00:00 2001
From: Kukks <evilkukka@gmail.com>
Date: Wed, 11 Mar 2020 16:51:33 +0100
Subject: [PATCH] fix e2e tests

---
 BTCPayServer.Tests/CheckoutUITests.cs | 3 ++-
 BTCPayServer.Tests/Extensions.cs      | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/BTCPayServer.Tests/CheckoutUITests.cs b/BTCPayServer.Tests/CheckoutUITests.cs
index 46531aea9..3ae9531a0 100644
--- a/BTCPayServer.Tests/CheckoutUITests.cs
+++ b/BTCPayServer.Tests/CheckoutUITests.cs
@@ -205,7 +205,8 @@ namespace BTCPayServer.Tests
                 IWebElement closebutton = null;
                 TestUtils.Eventually(() =>
                 {
-                    var iframe = s.Driver.SwitchTo().Frame("btcpay");
+                    var frameElement = s.Driver.FindElement(By.Name("btcpay"));
+                    var iframe = s.Driver.SwitchTo().Frame(frameElement);
                     closebutton = iframe.FindElement(By.ClassName("close-action"));
                     Assert.True(closebutton.Displayed);
                 });
diff --git a/BTCPayServer.Tests/Extensions.cs b/BTCPayServer.Tests/Extensions.cs
index 0f6d36b4e..22f3822eb 100644
--- a/BTCPayServer.Tests/Extensions.cs
+++ b/BTCPayServer.Tests/Extensions.cs
@@ -88,6 +88,10 @@ namespace BTCPayServer.Tests
                     if (!webElement.Displayed)
                         return;
                 }
+                catch (NoSuchWindowException)
+                {
+                    return;
+                }
                 catch (NoSuchElementException)
                 {
                     return;