Merge pull request #8058 from ajpinedam/anpi/fix.ios.commandbar.test

Fix CommandBar iOS BackButton Test
unoplatform · Feb 15, 2022 · a2ce826 · a2ce826
2 parents f4efc94 + 7ed3487
commit a2ce826
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/...App.UITests/Windows_UI_Xaml_Controls/CommandBarTests/UnoSamples_Tests.NativeCommandBar.cs b/...App.UITests/Windows_UI_Xaml_Controls/CommandBarTests/UnoSamples_Tests.NativeCommandBar.cs
@@ -258,8 +258,7 @@ public void When_Navigated_CommandBarShouldHideBackButtonTitle_NativeFrame()
 
 		[Test]
 		[AutoRetry]
-		[ActivePlatforms(Platform.iOS)]
-		[Ignore("Disabled because image button is not loading properly https://github.com/unoplatform/uno/issues/8014")]
+		[ActivePlatforms(Platform.iOS)]		
 		public void When_Navigated_CommandBarDisplayCustomBackButtonIcon_NativeFrame()
 		{
 			Run("UITests.Windows_UI_Xaml_Controls.CommandBar.BackButtonImage.CommandBar_Frame");

diff --git a/...Tests.Shared/Windows_UI_Xaml_Controls/CommandBar/BackButtonImage/CommandBar_Page2.xaml.cs b/...Tests.Shared/Windows_UI_Xaml_Controls/CommandBar/BackButtonImage/CommandBar_Page2.xaml.cs
@@ -39,9 +39,12 @@ public void OnButtonClicked(object sender, object args)
 
 	        var navigationBar = parent.FindFirstChild<UnoNavigationBar>();
 
-	        var image = navigationBar.BackIndicatorImage;
-	        ExpectedImage.Source = image;
+			var image = (UIDevice.CurrentDevice.CheckSystemVersion(13, 0))
+				? navigationBar.CompactAppearance.BackIndicatorImage
+				: navigationBar.BackIndicatorImage;
+
+			ExpectedImage.Source = image;
 #endif
-        }
+		}
     }
 }