chore: Adjust for backport

unoplatform · Oct 6, 2024 · 8002015 · 8002015
1 parent 06b8fc8
commit 8002015
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/src/Uno.UI.RuntimeTests/Tests/Microsoft_UI_Xaml_Controls/Given_WebView2.cs b/src/Uno.UI.RuntimeTests/Tests/Microsoft_UI_Xaml_Controls/Given_WebView2.cs
@@ -106,27 +106,17 @@ public async Task When_GoBack()
 		Assert.IsFalse(webView.CanGoForward);
 
 		webView.NavigationCompleted += (sender, e) => navigated = true;
-<<<<<<< HEAD
-		webView.CoreWebView2.Navigate("https://example.com/1");
-		await TestServices.WindowHelper.WaitFor(() => navigated, 3000);
-=======
 		webView.CoreWebView2.Navigate("https://uno-assets.platform.uno/tests/docs/WebView_NavigateToAnchor.html");
 		await TestServices.WindowHelper.WaitFor(() => navigated, 10000);
->>>>>>> 696e3bc96d (test: Adjust test duration for navigation)
 
 		Assert.IsFalse(webView.CoreWebView2.CanGoBack);
 		Assert.IsFalse(webView.CanGoBack);
 		Assert.IsFalse(webView.CoreWebView2.CanGoForward);
 		Assert.IsFalse(webView.CanGoForward);
 
 		navigated = false;
-<<<<<<< HEAD
-		webView.CoreWebView2.Navigate("https://example.com/2");
-		await TestServices.WindowHelper.WaitFor(() => navigated, 3000);
-=======
 		webView.CoreWebView2.Navigate("https://platform.uno");
 		await TestServices.WindowHelper.WaitFor(() => navigated, 10000);
->>>>>>> 696e3bc96d (test: Adjust test duration for navigation)
 
 		Assert.IsTrue(webView.CoreWebView2.CanGoBack);
 		Assert.IsTrue(webView.CanGoBack);