From 7e0b4cca0f102c5a8d82b27156056a1bee289920 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Joye?= <clement.joye@authority.se>
Date: Wed, 8 Jul 2020 15:51:01 +0200
Subject: [PATCH 1/2] Fix for ui tests

---
 .../PageObjectModels/Payment/CardPaymentPage.cs        | 10 ++++++++--
 .../Test/Helpers/PaymentHelper.cs                      |  7 +++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/Samples/Sample.AspNetCore.SystemTests/PageObjectModels/Payment/CardPaymentPage.cs b/src/Samples/Sample.AspNetCore.SystemTests/PageObjectModels/Payment/CardPaymentPage.cs
index 43dd7466..267866a6 100644
--- a/src/Samples/Sample.AspNetCore.SystemTests/PageObjectModels/Payment/CardPaymentPage.cs
+++ b/src/Samples/Sample.AspNetCore.SystemTests/PageObjectModels/Payment/CardPaymentPage.cs
@@ -6,7 +6,13 @@ namespace Sample.AspNetCore.SystemTests.PageObjectModels.Payment
 
     public class CardPaymentPage : Page<_>
     {
-        [FindById("CardNumber")] 
+        [FindByDescendantAttribute("value", values: "credit")]
+        public Label<_> CreditCard { get; set; }
+
+        [FindByDescendantAttribute("value", values: "debit")]
+        public Label<_> DebitCard { get; set; }
+
+        [FindById("CardNumber")]
         public TextInput<_> CardNumber { get; set; }
 
         [FindById("Expiry")]
@@ -17,7 +23,7 @@ public class CardPaymentPage : Page<_>
 
         [FindById("AmountDiv")]
         public TextInput<_> TotalAmount { get; set; }
-        
+
         [FindById("submit-button")]
         public Button<_> Submit { get; set; }
 
diff --git a/src/Samples/Sample.AspNetCore.SystemTests/Test/Helpers/PaymentHelper.cs b/src/Samples/Sample.AspNetCore.SystemTests/Test/Helpers/PaymentHelper.cs
index 8a2accae..8d3bf9f6 100644
--- a/src/Samples/Sample.AspNetCore.SystemTests/Test/Helpers/PaymentHelper.cs
+++ b/src/Samples/Sample.AspNetCore.SystemTests/Test/Helpers/PaymentHelper.cs
@@ -14,6 +14,13 @@ public static SveaPaymentFramePage PayWithCard(this SveaPaymentFramePage page)
             .PaymentMethods.Card.Click()
             .Submit.ClickAndGo<CardPaymentPage>()
             .CardNumber.IsVisible.WaitTo.BeTrue()
+            .Do(x =>
+            {
+                if (x.DebitCard.Exists(new SearchOptions { IsSafely = true, Timeout = TimeSpan.FromSeconds(1) }))
+                {
+                    x.DebitCard.Click();
+                }
+            })
             .CardNumber.Set(TestDataService.CreditCardNumber)
             .Expiry.Set(TestDataService.CreditCardExpiratioDate)
             .Cvc.Set(TestDataService.CreditCardCvc)

From f8b64fdf95d4ea50d96e2634c744513547e4d88e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Joye?= <clement.joye@authority.se>
Date: Wed, 8 Jul 2020 15:56:52 +0200
Subject: [PATCH 2/2] Increased speed of tests + more fix

---
 .../PageObjectModels/Payment/Blocks/PaymentMethodsBlock.cs       | 1 -
 .../Sample.AspNetCore.SystemTests/Test/Helpers/PaymentHelper.cs  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Samples/Sample.AspNetCore.SystemTests/PageObjectModels/Payment/Blocks/PaymentMethodsBlock.cs b/src/Samples/Sample.AspNetCore.SystemTests/PageObjectModels/Payment/Blocks/PaymentMethodsBlock.cs
index d716462c..1ac143eb 100644
--- a/src/Samples/Sample.AspNetCore.SystemTests/PageObjectModels/Payment/Blocks/PaymentMethodsBlock.cs
+++ b/src/Samples/Sample.AspNetCore.SystemTests/PageObjectModels/Payment/Blocks/PaymentMethodsBlock.cs
@@ -2,7 +2,6 @@
 
 namespace Sample.AspNetCore.SystemTests.PageObjectModels.Payment
 {
-    [Wait(1, TriggerEvents.BeforeClick, AppliesTo = TriggerScope.Children)]
     [ControlDefinition("form[@data-testid='confirm-form']", ComponentTypeName = "Payment Methods Block")]
     public class PaymentMethodsBlock<TOwner> : Control<TOwner> where TOwner : PageObject<TOwner>
     {
diff --git a/src/Samples/Sample.AspNetCore.SystemTests/Test/Helpers/PaymentHelper.cs b/src/Samples/Sample.AspNetCore.SystemTests/Test/Helpers/PaymentHelper.cs
index 8d3bf9f6..f19b3c2b 100644
--- a/src/Samples/Sample.AspNetCore.SystemTests/Test/Helpers/PaymentHelper.cs
+++ b/src/Samples/Sample.AspNetCore.SystemTests/Test/Helpers/PaymentHelper.cs
@@ -2,6 +2,7 @@
 using Sample.AspNetCore.SystemTests.PageObjectModels;
 using Sample.AspNetCore.SystemTests.PageObjectModels.Payment;
 using Sample.AspNetCore.SystemTests.Services;
+using System;
 
 namespace Sample.AspNetCore.SystemTests.Test.Helpers
 {