diff options
4 files changed, 13 insertions, 15 deletions
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41424.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41424.cs index f8f48aeb..a88bc507 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41424.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41424.cs @@ -44,15 +44,12 @@ namespace Xamarin.Forms.Controls.Issues public void DatePickerCancelShouldUnfocus() { RunningApp.Tap(q => q.Marked(DatePicker)); - RunningApp.WaitForElement(q => q.Marked("Cancel")); - - RunningApp.Tap(q => q.Marked("Cancel")); + + RunningApp.Back(); RunningApp.WaitForElement(q => q.Marked("Click to focus DatePicker")); RunningApp.Tap(q => q.Marked("Click to focus DatePicker")); - RunningApp.WaitForElement(q => q.Marked("Cancel")); - - RunningApp.Tap(q => q.Marked("Cancel")); + RunningApp.Back(); } #endif diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42074.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42074.cs index 04bcdf8c..5f1a0ef3 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42074.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42074.cs @@ -44,15 +44,12 @@ namespace Xamarin.Forms.Controls.Issues public void TimePickerCancelShouldUnfocus() { RunningApp.Tap(q => q.Marked(TimePicker)); - RunningApp.WaitForElement(q => q.Marked("Cancel")); - RunningApp.Tap(q => q.Marked("Cancel")); + RunningApp.Back(); RunningApp.WaitForElement(q => q.Marked("Click to focus TimePicker")); RunningApp.Tap(q => q.Marked("Click to focus TimePicker")); - RunningApp.WaitForElement(q => q.Marked("Cancel")); - - RunningApp.Tap(q => q.Marked("Cancel")); + RunningApp.Back(); } #endif diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GestureBubblingTests.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GestureBubblingTests.cs index 38736211..c23d3db8 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GestureBubblingTests.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GestureBubblingTests.cs @@ -72,13 +72,15 @@ namespace Xamarin.Forms.Controls.Issues // These controls show a pop-up which we have to cancel/done out of before we can continue #if __ANDROID__ var cancelButtonText = "Cancel"; + RunningApp.Back(); #elif __IOS__ var cancelButtonText = "Done"; + RunningApp.WaitForElement(q => q.Marked(cancelButtonText)); + RunningApp.Tap(q => q.Marked(cancelButtonText)); #else var cancelButtonText = "X"; #endif - RunningApp.WaitForElement(q => q.Marked(cancelButtonText)); - RunningApp.Tap(q => q.Marked(cancelButtonText)); + } if (frameShouldRegisterTap) diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/InputTransparentTests.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/InputTransparentTests.cs index 1d23f149..080acfb7 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/InputTransparentTests.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/InputTransparentTests.cs @@ -65,13 +65,15 @@ namespace Xamarin.Forms.Controls.Issues // These controls show a pop-up which we have to cancel/done out of before we can continue #if __ANDROID__ var cancelButtonText = "Cancel"; + System.Threading.Tasks.Task.Delay(1000).Wait(); + RunningApp.Back(); #elif __IOS__ var cancelButtonText = "Done"; + RunningApp.WaitForElement(q => q.Marked(cancelButtonText)); + RunningApp.Tap(q => q.Marked(cancelButtonText)); #else var cancelButtonText = "Cancel"; #endif - RunningApp.WaitForElement(q => q.Marked(cancelButtonText)); - RunningApp.Tap(q => q.Marked(cancelButtonText)); } // Since InputTransparent is set to false, the start label should not have changed |