[Testing] Fix for enable uitests ios26

eng/pipelines/ci-uitests.yml

@@ -166,12 +166,12 @@ stages:
       # BuildNativeAOT is false by default, but true in devdiv environment
       BuildNativeAOT: ${{ or(parameters.BuildNativeAOT, and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'devdiv'))) }}
       RunNativeAOT: ${{ parameters.RunNativeAOT }}
-      ${{ if or(parameters.BuildEverything, and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'devdiv'))) }}:
+      ${{ if or(parameters.BuildEverything, ne(variables['Build.Reason'], 'PullRequest')) }}:
         androidApiLevels: [ 30 ]
-        iosVersions: [ '18.4' ]
+        iosVersions: [ '18.5', 'latest' ]
       ${{ else }}:
         androidApiLevels: [ 30 ]
-        iosVersions: [ '18.4' ]
+        iosVersions: [ 'latest' ]
       projects:
         - name: controls
           desc: Controls

eng/pipelines/common/ui-tests.yml

@@ -9,6 +9,7 @@ parameters:
   androidApiLevelsExtended: [ 36 ] # API 36 for Material3 tests with Pixel 3 XL
   iosVersions: [ 'latest' ]
   provisionatorChannel: 'latest'
+  defaultiOSVersion: '26.0'
   timeoutInMinutes: 180
   skipProvisioning: true
   BuildNativeAOT: false # Parameter to control whether NativeAOT artifacts should be built
@@ -295,7 +296,7 @@ stages:
                     parameters:
                       platform: ios
                       ${{ if eq(version, 'latest') }}:
-                        version: 18.5
+                        version: ${{ parameters.defaultiOSVersion }}
                       ${{ if ne(version, 'latest') }}:
                         version: ${{ version }}
                       path: ${{ project.ios }}
@@ -338,7 +339,7 @@ stages:
                     parameters:
                       platform: ios
                       ${{ if eq(version, 'latest') }}:
-                        version: 18.5
+                        version: ${{ parameters.defaultiOSVersion }}
                       ${{ if ne(version, 'latest') }}:
                         version: ${{ version }}
                       path: ${{ project.ios }}
@@ -382,7 +383,7 @@ stages:
                     parameters:
                       platform: ios
                       ${{ if eq(version, 'latest') }}:
-                        version: 18.5
+                        version: ${{ parameters.defaultiOSVersion }}
                       ${{ if ne(version, 'latest') }}:
                         version: ${{ version }}
                       path: ${{ project.ios }}
@@ -432,7 +433,7 @@ stages:
                       parameters:
                         platform: ios
                         ${{ if eq(version, 'latest') }}:
-                          version: 18.5
+                          version: ${{ parameters.defaultiOSVersion }}
                         ${{ if ne(version, 'latest') }}:
                           version: ${{ version }}
                         path: ${{ project.ios }}

src/Controls/tests/TestCases.HostApp/Elements/StepperCoreGalleryPage.cs

@@ -12,6 +12,10 @@ public StepperCoreGalleryPage()
 		// Default
 		var defaultLabel = new Label { AutomationId = "DefaultLabel", Text = "Default" };
 		var defaultStepper = new Stepper { AutomationId = "DefaultStepper" };
+		if (OperatingSystem.IsIOSVersionAtLeast(26))
+		{
+			defaultStepper.HorizontalOptions = LayoutOptions.Center;
+		}
 		var defaultLabelValue = new Label
 		{
 			AutomationId = "DefaultLabelValue",

src/Controls/tests/TestCases.HostApp/FeatureMatrix/Editor/EditorControlPage.xaml

@@ -8,7 +8,12 @@
               <Label Text="Editor Control"
                      FontSize="20"
                      Margin="0,0,0,50"
-                     HorizontalOptions="Center"/>
+                     HorizontalOptions="Center"
+                     AutomationId="EditorControlTitleLabel">
+                     <Label.GestureRecognizers>
+                            <TapGestureRecognizer Tapped="OnLabelTapped"/>
+                     </Label.GestureRecognizers>
+              </Label>
 
               <local:UITestEditor x:Name="EditorControl"
                                   IsCursorVisible="False"

src/Controls/tests/TestCases.HostApp/FeatureMatrix/Editor/EditorControlPage.xaml.cs

@@ -124,4 +124,9 @@ private void EditorControl_Unfocused(object sender, FocusEventArgs e)
 			vm.UnfocusedText = eventInfo;
 		}
 	}
+
+	private void OnLabelTapped(object sender, EventArgs e)
+	{
+		EditorControl.Unfocus();
+	}
 }

src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml

@@ -47,7 +47,7 @@
                                  Unfocused="EntryControl_Unfocused"
                                  AutomationId="TestEntry"/>
 
-              <Grid HeightRequest="130"/>
+              <Grid x:Name="grid"/>
 
               <Button Text="Options"
                       FontSize="11"

src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml.cs

@@ -21,6 +21,14 @@ public partial class EntryControlMainPage : ContentPage
 	public EntryControlMainPage(EntryViewModel viewModel)
 	{
 		InitializeComponent();
+		if (OperatingSystem.IsIOSVersionAtLeast(26))
+		{
+			grid.HeightRequest = 100;
+		}
+		else
+		{
+			grid.HeightRequest = 130;
+		}
 		_viewModel = viewModel;
 		BindingContext = _viewModel;
 		EntryControl.PropertyChanged += UpdateEntryControl;

src/Controls/tests/TestCases.HostApp/FeatureMatrix/IndicatorView/IndicatorViewOptionsPage.xaml

@@ -109,6 +109,7 @@
                                          Minimum="1"
                                          Maximum="100"
                                          Increment="10"
+                                         HorizontalOptions="Start"
                                          AutomationId="IndicatorSizeStepper"/>
                         </StackLayout>
                         <StackLayout Grid.Column="1"
@@ -120,6 +121,7 @@
                                          Minimum="0"
                                          Maximum="50"
                                          Increment="1"
+                                         HorizontalOptions="Start"
                                          AutomationId="PositionStepper"/>
                         </StackLayout>
 
@@ -268,6 +270,7 @@
                                  Minimum="1"
                                  Maximum="100"
                                  Increment="1"
+                                 HorizontalOptions="Start"
                                  AutomationId="MaximumVisibleStepper"/>
                 </StackLayout>
 

src/Controls/tests/TestCases.HostApp/FeatureMatrix/Stepper/StepperControlPage.xaml

@@ -31,7 +31,8 @@
              IsEnabled="{Binding IsEnabled}"
              IsVisible="{Binding IsVisible}"
              FlowDirection="{Binding FlowDirection}"
-             AutomationId="StepperControl"/>
+             AutomationId="StepperControl"
+             x:Name="StepperControl"/>
 
     <!-- Minimum Value -->
     <Label Grid.Row="1"

src/Controls/tests/TestCases.HostApp/FeatureMatrix/Stepper/StepperControlPage.xaml.cs

@@ -18,6 +18,12 @@ public partial class StepperControlMainPage : ContentPage
 	public StepperControlMainPage()
 	{
 		InitializeComponent();
+
+		if (OperatingSystem.IsIOSVersionAtLeast(26))
+		{
+			StepperControl.HorizontalOptions = LayoutOptions.Center;
+		}
+
 		BindingContext = _viewModel = new StepperViewModel();
 	}
 

src/Controls/tests/TestCases.HostApp/FeatureMatrix/TwoPaneView/TwoPaneViewOptionsPage.xaml

@@ -24,6 +24,7 @@
                        Minimum="0"
                        Increment="200"
                        ValueChanged="OnTallModeHeightChanged"
+                       HorizontalOptions="Start"
                        AutomationId="TallModeStepper"/>
               <Label x:Name="TallModeHeightValue"
                      Text="500px"
@@ -37,6 +38,7 @@
                        Minimum="0"
                        Increment="200"
                        ValueChanged="OnWideModeWidthChanged"
+                       HorizontalOptions="Start"
                        AutomationId="WideModeStepper"/>
               <Label x:Name="WideModeWidthValue"
                      Text="700px"/>
@@ -50,6 +52,7 @@
                        Minimum="0.5"
                        Increment="0.5"
                        ValueChanged="OnPane1LengthChanged"
+                       HorizontalOptions="Start"
                        AutomationId="Pane1LengthStepper"/>
               <Label x:Name="Pane1LengthValue"
                      Text="1"
@@ -64,6 +67,7 @@
                        Minimum="0.5"
                        Increment="0.5"
                        ValueChanged="OnPane2LengthChanged"
+                       HorizontalOptions="Start"
                        AutomationId="Pane2LengthStepper"/>
               <Label x:Name="Pane2LengthValue"
                      Text="1"

src/Controls/tests/TestCases.HostApp/Issues/Issue17782.xaml

@@ -5,7 +5,7 @@
              xmlns:ns="clr-namespace:Maui.Controls.Sample.Issues"
              Title="Issue 17782">
 
-  <VerticalStackLayout x:Name="verticalStack" Spacing="10">
+  <VerticalStackLayout x:Name="verticalStack">
 
     <!-- Case 1: Add text to the editor with initial CharacterSpacing set to 10.
          The Button click updates the text to a predefined value. -->

src/Controls/tests/TestCases.HostApp/Issues/Issue17782.xaml.cs

@@ -10,6 +10,14 @@ public partial class Issue17782 : ContentPage
 		public Issue17782()
 		{
 			InitializeComponent();
+			if (OperatingSystem.IsIOSVersionAtLeast(26))
+			{
+				verticalStack.Spacing = 0;
+			}
+			else
+			{
+				verticalStack.Spacing = 10;
+			}
 		}
 
 		private void OnAddEditorTextClicked(object sender, EventArgs e)

src/Controls/tests/TestCases.HostApp/Issues/Issue20706.xaml.cs

@@ -8,6 +8,10 @@ public partial class Issue20706 : ContentPage
 		public Issue20706()
 		{
 			InitializeComponent();
+			if (OperatingSystem.IsIOSVersionAtLeast(26))
+			{
+				stepperValue.HorizontalOptions = LayoutOptions.Center;
+			}
 		}
 
 		private void button_Clicked(object sender, EventArgs e)

src/Controls/tests/TestCases.HostApp/Issues/Issue24496.xaml

@@ -54,7 +54,7 @@
             <x:String>Test 4</x:String>
         </x:Array>
     </ContentPage.Resources>
-    <ScrollView>
+    <ScrollView AutomationId="ScrollViewId">
 
         <Grid 
             Padding="{x:OnPlatform Default='30,0', iOS='30,0,30,34'}"

src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/EditorFeatureTests.cs

@@ -41,7 +41,12 @@ public void VerifyEditorCompletedEvent()
 		App.WaitForElement("TestEditor");
 		App.Tap("TestEditor");
 		App.PressEnter();
+#if ANDROID
 		App.DismissKeyboard();
+#else
+		App.WaitForElement("EditorControlTitleLabel");
+		App.Tap("EditorControlTitleLabel");
+#endif
 		Assert.That(App.WaitForElement("CompletedLabel").GetText(), Is.EqualTo("Completed: Event Triggered"));
 	}
 
@@ -84,7 +89,12 @@ public async Task VerifyEditorUnfocusedEvent()
 		App.WaitForElement("SelectionLengthEntry");
 		App.Tap("SelectionLengthEntry");
 		await Task.Delay(100);
+#if ANDROID
 		App.DismissKeyboard();
+#else
+		App.WaitForElement("EditorControlTitleLabel");
+		App.Tap("EditorControlTitleLabel");
+#endif
 		Assert.That(App.WaitForElement("UnfocusedLabel").GetText(), Is.EqualTo("Unfocused: Event Triggered"));
 	}
 

src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/NavigationPageFeatureTests.cs

@@ -249,6 +249,10 @@ public void SetBarBackground_Linear_Radial_Clear_Visual()
 		[Test, Order(10)]
 		public void SetIconColor_Red_Purple_Default_Visual()
 		{
+			if (App is AppiumIOSApp iosApp && HelperExtensions.IsIOS26OrHigher(iosApp))
+			{
+				Assert.Ignore("Ignored due to a bug issue in iOS 26"); // Issue Link: https://github.com/dotnet/maui/issues/33966
+			}
 			App.WaitForElement("ResetButton");
 			App.Tap("ResetButton");
 
@@ -275,8 +279,11 @@ public void SetIconColor_Red_Purple_Default_Visual()
 		[Test, Order(11)]
 		public void TitleIcon_Add_Visual()
 		{
-			App.WaitForElement("PopToRootPageButton");
-			App.Tap("PopToRootPageButton");
+			if (!(App is AppiumIOSApp iosApp && HelperExtensions.IsIOS26OrHigher(iosApp)))
+			{
+				App.WaitForElement("PopToRootPageButton");
+				App.Tap("PopToRootPageButton");
+			}
 
 			App.WaitForElement("ResetButton");
 			App.Tap("ResetButton");
@@ -307,6 +314,10 @@ public void TitleIcon_AddingTwice_DoesNotDuplicate()
 		[Test, Order(13)]
 		public void Combine_BarBackgroundColor_TextColor_IconColor_Visual()
 		{
+			if (App is AppiumIOSApp iosApp && HelperExtensions.IsIOS26OrHigher(iosApp))
+			{
+				Assert.Ignore("Ignored due to a bug issue in iOS 26"); // Issue Link: https://github.com/dotnet/maui/issues/33966
+			}
 			App.WaitForElement("ResetButton");
 			App.Tap("ResetButton");
 			// Set bar background color and text color
@@ -326,8 +337,11 @@ public void Combine_BarBackgroundColor_TextColor_IconColor_Visual()
 		[Test, Order(14)]
 		public void TitleIcon_And_TitleView_Persist_On_Push_Then_Clear()
 		{
-			App.WaitForElement("PopToRootPageButton");
-			App.Tap("PopToRootPageButton");
+			if (!(App is AppiumIOSApp iosApp && HelperExtensions.IsIOS26OrHigher(iosApp)))
+			{
+				App.WaitForElement("PopToRootPageButton");
+				App.Tap("PopToRootPageButton");
+			}
 
 			App.WaitForElement("ResetButton");
 			App.Tap("ResetButton");

src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ProgressBarFeatureTests.cs

@@ -115,6 +115,10 @@ public void ProgressBar_SetIsVisibleFalse_VerifyLabel()
 		[Category(UITestCategories.ProgressBar)]
 		public void ProgressBar_ChangeFlowDirection_RTL_VerifyLabel()
 		{
+			if (App is AppiumIOSApp iosApp && HelperExtensions.IsIOS26OrHigher(iosApp))
+			{
+				Assert.Ignore("Ignored due to a bug issue in iOS 26"); // Issue Link: https://github.com/dotnet/maui/issues/33969
+			}
 			App.WaitForElement("ResetButton");
 			App.Tap("ResetButton");
 			App.WaitForElement("FlowDirectionRTL");

src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/SliderFeatureTests.cs

@@ -360,6 +360,10 @@ public void Slider_ChangeBackgroundColor_VerifyVisualState()
 		[Category(UITestCategories.Slider)]
 		public void Slider_ChangeThumbImageSource_VerifyVisualState()
 		{
+			if (App is AppiumIOSApp iosApp && HelperExtensions.IsIOS26OrHigher(iosApp))
+			{
+				Assert.Ignore("Ignored due to a bug issue in iOS 26"); // Issue Link: https://github.com/dotnet/maui/issues/33967
+			}
 			App.WaitForElement("Options");
 			App.Tap("Options");
 			App.WaitForElement("ThumbImageSourceButton");
@@ -438,6 +442,10 @@ public void Slider_SetValueAndMaxTrackColor_VerifyVisualState()
 		[Category(UITestCategories.Slider)]
 		public void Slider_SetValueAndThumbImageSource_VerifyVisualState()
 		{
+			if (App is AppiumIOSApp iosApp && HelperExtensions.IsIOS26OrHigher(iosApp))
+			{
+				Assert.Ignore("Ignored due to a bug issue in iOS 26"); // Issue Link: https://github.com/dotnet/maui/issues/33967
+			}
 			App.WaitForElement("Options");
 			App.Tap("Options");
 			App.WaitForElement("ValueEntry");
@@ -515,6 +523,10 @@ public void Slider_SetThumbAndBackgroundColor_VerifyVisualState()
 		[Category(UITestCategories.Slider)]
 		public void Slider_SetThumbColorAndThumbImageSource_VerifyVisualState()
 		{
+			if (App is AppiumIOSApp iosApp && HelperExtensions.IsIOS26OrHigher(iosApp))
+			{
+				Assert.Ignore("Ignored due to a bug issue in iOS 26"); // Issue Link: https://github.com/dotnet/maui/issues/33967
+			}
 			App.WaitForElement("Options");
 			App.Tap("Options");
 			App.WaitForElement("ThumbColorGreenButton");
@@ -862,6 +874,10 @@ public void Slider_SetBackgroundColorAndIsEnable_VerifyVisualState()
 
 		public void Slider_SetThumbImageSourceAndThumbColor_VerifyVisualState()
 		{
+			if (App is AppiumIOSApp iosApp && HelperExtensions.IsIOS26OrHigher(iosApp))
+			{
+				Assert.Ignore("Ignored due to a bug issue in iOS 26"); // Issue Link: https://github.com/dotnet/maui/issues/33967
+			}
 			App.WaitForElement("Options");
 			App.Tap("Options");
 			App.WaitForElement("ThumbImageSourceButton");

src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/StepperFeatureTests.cs

@@ -281,6 +281,10 @@ public void Stepper_ResetToInitialState_VerifyDefaultValues()
 	[Test]
 	public void Stepper_IncrementDoesNotExceedMaximum()
 	{
+		if (App is AppiumIOSApp iosApp && HelperExtensions.IsIOS26OrHigher(iosApp))
+		{
+			Assert.Ignore("Ignored due to Stepper Increment issue in iOS 26."); // Issue Link: https://github.com/dotnet/maui/issues/33769
+		}
 		App.WaitForElement("Options");
 		App.Tap("Options");
 

src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ToolbarFeatureTests.cs

@@ -185,7 +185,7 @@ public void VerifyToolBar_MultipleSecondaryInteractions()
 	}
 #endif
 
-#if TEST_FAILS_ON_ANDROID && TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_WINDOWS// Issue Link: https://github.com/dotnet/maui/issues/30675
+#if TEST_FAILS_ON_ANDROID && TEST_FAILS_ON_IOS && TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_WINDOWS// On iOS 26, the image differs on each CI run, so disabled the test for iOS. Issue Link: https://github.com/dotnet/maui/issues/30675
 	[Test, Order(13)]
 	[Category(UITestCategories.ToolbarItem)]
 	public void VerifySecondaryToolBar_IconAppearance()