Merge pull request #35 from unoplatform/dev/dr/Edge

feat(EdgeSupport): Add support for the chromium edge
unoplatform · Aug 10, 2023 · 9669fd2 · 9669fd2
2 parents 64c6cac + bfdca37
commit 9669fd2
Show file tree

Hide file tree

Showing 20 changed files with 662 additions and 343 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,7 +13,6 @@
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
-launchSettings.json
 
 # Build results
 [Dd]ebug[-\w]*/

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -47,17 +47,11 @@ jobs:
     displayName: Use GitVersion
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 5.0.101'
-    inputs:
-      packageType: sdk
-      version: 5.0.101
-
-  - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 6.0.401'
+    displayName: 'Use .NET SDK'
     retryCountOnTaskFailure: 3
     inputs:
       packageType: sdk
-      version: 6.0.401
+      version: 7.0.302
 
   - task: MSBuild@1
     inputs:
@@ -110,16 +104,11 @@ jobs:
     clean: true
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 5.0.101'
-    inputs:
-      packageType: sdk
-      version: 5.0.101
-
-  - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 6.0.401'
+    displayName: 'Use .NET SDK'
+    retryCountOnTaskFailure: 3
     inputs:
       packageType: sdk
-      version: 6.0.401
+      version: 7.0.302
 
   - bash: |
       chmod +x build/wasm-uitest-run.sh

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -19,6 +19,7 @@
 
     <!-- Force embedded roslyn generators -->
     <UnoUIUseRoslynSourceGenerators>true</UnoUIUseRoslynSourceGenerators>
+	  <!--<LangVersion>10.0</LangVersion>-->
   </PropertyGroup>
 
   <Choose>

diff --git a/src/Sample/Sample.UITests/Constants.cs b/src/Sample/Sample.UITests/Constants.cs
@@ -4,6 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using Uno.UITest.Helpers.Queries;
+using Uno.UITests.Helpers;
 
 namespace Sample.UITests
 {
@@ -15,5 +16,7 @@ public class Constants
 		public readonly static string iOSDeviceNameOrId = "iPad Pro (12.9-inch) (5th generation)";
 
 		public readonly static Platform CurrentPlatform = Platform.Browser;
+
+		public readonly static Browser WebAssemblyBrowser = Browser.Chrome;
 	}
 }
diff --git a/src/Sample/Sample.UITests/DragCoordinates_Tests.cs b/src/Sample/Sample.UITests/DragCoordinates_Tests.cs
@@ -16,6 +16,8 @@ public class DragCoordinates_Tests : TestBase
 		[Test]
 		public void DragBorder01()
 		{
+			App.Screenshot("home screen");
+
 			Query testSelector = q => q.Marked("DragCoordinates 01");
 
 			Query rootCanvas = q => q.Marked("rootCanvas");

diff --git a/src/Sample/Sample.UITests/Sample.UITests.csproj b/src/Sample/Sample.UITests/Sample.UITests.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net47</TargetFramework>
-    <LangVersion>7.3</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Sample/Sample.UITests/TestBase.cs b/src/Sample/Sample.UITests/TestBase.cs
@@ -40,6 +40,7 @@ public static void InitializeTestEnvrionment()
 			AppInitializer.TestEnvironment.AndroidAppName = Constants.AndroidAppName;
 			AppInitializer.TestEnvironment.iOSDeviceNameOrId = Constants.iOSDeviceNameOrId;
 			AppInitializer.TestEnvironment.CurrentPlatform = Constants.CurrentPlatform;
+			AppInitializer.TestEnvironment.WebAssemblyBrowser = Constants.WebAssemblyBrowser;
 
 #if DEBUG
 			AppInitializer.TestEnvironment.WebAssemblyHeadless = false;

diff --git a/src/Sample/Sample.Wasm/Properties/launchSettings.json b/src/Sample/Sample.Wasm/Properties/launchSettings.json
@@ -11,17 +11,20 @@
     "IIS Express": {
       "commandName": "IISExpress",
       "launchBrowser": true,
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
     "Sample.Wasm": {
       "commandName": "Project",
       "launchBrowser": true,
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+      "launchUrl": "http://localhost:55932/",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
       "applicationUrl": "http://localhost:5000"
     }
   }
-}
+}
diff --git a/src/Sample/Sample.Wasm/Sample.Wasm.csproj b/src/Sample/Sample.Wasm/Sample.Wasm.csproj
@@ -1,43 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk.Web">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <WasmHead>true</WasmHead>
-    <DefineConstants>$(DefineConstants);__WASM__</DefineConstants>
-    <NoWarn>NU1701</NoWarn>
-    <UnoUIUseRoslynSourceGenerators>true</UnoUIUseRoslynSourceGenerators>
-  </PropertyGroup>
-  <PropertyGroup>
-    <IsUiAutomationMappingEnabled>true</IsUiAutomationMappingEnabled>
-  </PropertyGroup>
-  <ItemGroup>
-    <Content Include="..\Sample.UWP\Assets\*.png" Link="Assets\%(FileName)%(Extension)" />
-    <Content Include="Fonts\winjs-symbols.woff2" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="WasmCSS\Fonts.css" />
-    <EmbeddedResource Include="WasmScripts\AppManifest.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <LinkerDescriptor Include="LinkerConfig.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <!--
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net6.0</TargetFramework>
+		<WasmHead>true</WasmHead>
+		<DefineConstants>$(DefineConstants);__WASM__</DefineConstants>
+		<NoWarn>NU1701</NoWarn>
+		<UnoUIUseRoslynSourceGenerators>true</UnoUIUseRoslynSourceGenerators>
+	</PropertyGroup>
+	<PropertyGroup>
+		<IsUiAutomationMappingEnabled>true</IsUiAutomationMappingEnabled>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)'=='Debug'">
+		<MonoRuntimeDebuggerEnabled>true</MonoRuntimeDebuggerEnabled>
+		<DefineConstants>$(DefineConstants);TRACE;DEBUG</DefineConstants>
+		<DebugType>portable</DebugType>
+		<DebugSymbols>true</DebugSymbols>
+	</PropertyGroup>
+	<ItemGroup>
+		<Content Include="..\Sample.UWP\Assets\*.png" Link="Assets\%(FileName)%(Extension)" />
+		<Content Include="Fonts\winjs-symbols.woff2" />
+	</ItemGroup>
+	<ItemGroup>
+		<EmbeddedResource Include="WasmCSS\Fonts.css" />
+		<EmbeddedResource Include="WasmScripts\AppManifest.js" />
+	</ItemGroup>
+	<ItemGroup>
+		<LinkerDescriptor Include="LinkerConfig.xml" />
+	</ItemGroup>
+	<ItemGroup>
+		<!--
     This item group is required by the project templace because of the
     new SDK-Style project, otherwise some files are not aded automatically.
 
     You can safely remove this ItemGroup completely.
     -->
-    <Compile Remove="Program.cs" />
-    <Compile Include="Program.cs" />
-    <Content Include="LinkerConfig.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Uno.UI.WebAssembly" Version="3.7.6" />
-    <PackageReference Include="Uno.Wasm.Bootstrap" Version="7.0.20" />
-    <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.20" />
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.1" />
-  </ItemGroup>
-  <Import Project="..\Sample.Shared\Sample.Shared.projitems" Label="Shared" Condition="Exists('..\Sample.Shared\Sample.Shared.projitems')" />
+		<Compile Remove="Program.cs" />
+		<Compile Include="Program.cs" />
+		<Content Include="LinkerConfig.xml" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Uno.UI.WebAssembly" Version="3.7.6" />
+		<PackageReference Include="Uno.Wasm.Bootstrap" Version="7.0.20" />
+		<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.20" />
+		<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.1" />
+	</ItemGroup>
+	<Import Project="..\Sample.Shared\Sample.Shared.projitems" Label="Shared" Condition="Exists('..\Sample.Shared\Sample.Shared.projitems')" />
 </Project>
diff --git a/src/Uno.UITest.Helpers/AppInitializer.cs b/src/Uno.UITest.Helpers/AppInitializer.cs
@@ -179,29 +179,38 @@ private static IApp CreateBrowserApp(bool alreadyRunningApp)
 			{
 				var configurator = Uno.UITest.Selenium.ConfigureApp
 					.WebAssembly
-					.Uri(new Uri(TestEnvironment.WebAssemblyDefaultUri));
-
+					.Uri(new Uri(TestEnvironment.WebAssemblyDefaultUri))
+					.UsingBrowser(TestEnvironment.WebAssemblyBrowser.ToString());
 
 				if(!string.IsNullOrEmpty(TestEnvironment.ChromeDriverPath))
 				{
-					configurator = configurator.ChromeDriverLocation(
-						Path.Combine(TestContext.CurrentContext.TestDirectory,
-						TestEnvironment.ChromeDriverPath.Replace('\\', Path.DirectorySeparatorChar)));
+					var driverPath = Path.Combine(
+						TestContext.CurrentContext.TestDirectory,
+						TestEnvironment.ChromeDriverPath.Replace('\\', Path.DirectorySeparatorChar));
+					configurator = configurator.DriverPath(driverPath);
+				}
+				else if(!string.IsNullOrEmpty(TestEnvironment.SeleniumDriverPath))
+				{
+					var driverPath = Path.Combine(
+						TestContext.CurrentContext.TestDirectory,
+						TestEnvironment.SeleniumDriverPath.Replace('\\', Path.DirectorySeparatorChar));
+					configurator = configurator.DriverPath(driverPath);
 				}
 
-				if(!TestEnvironment.WebAssemblyHeadless)
+				if(TestEnvironment.WebAssemblyHeadless)
 				{
 					configurator = configurator
-						.Headless(false)
-						.SeleniumArgument("--remote-debugging-port=9222");
+						.Headless(true);
 				}
 				else
 				{
 					configurator = configurator
-						.Headless(true);
+						.Headless(false)
+						.SeleniumArgument("--remote-debugging-port=9222");
 				}
 
-				_currentApp = configurator.ScreenShotsPath(TestContext.CurrentContext.TestDirectory)
+				_currentApp = configurator
+					.ScreenShotsPath(TestContext.CurrentContext.TestDirectory)
 					.StartApp();
 
 				return _currentApp;

diff --git a/src/Uno.UITest.Helpers/AppInitializerEnvironment.cs b/src/Uno.UITest.Helpers/AppInitializerEnvironment.cs
@@ -45,9 +45,26 @@ internal AppInitializerEnvironment()
 		/// </remarks>
 		public string ChromeDriverPath { get; set; }
 
+		/// <summary>
+		/// Defines the location of selenium driver.
+		/// </summary>
+		/// <remarks>
+		/// If not defined, the test engine will select the version based on
+		/// the currently installed browsers version.
+		/// </remarks>
+		public string SeleniumDriverPath { get; set; }
+
 		/// <summary>
 		/// Defines if the browser tests are running in chrome without a window.
 		/// </summary>
 		public bool WebAssemblyHeadless { get; set; } = true;
+
+		/// <summary>
+		/// Defines the browser to use for the Web platform. Cf. remarks about compatibility
+		/// </summary>
+		/// <remarks>
+		/// Note that all browser does not supports all options defined here. For instance Edge does support only the <see cref="SeleniumDriverPath"/>.
+		/// </remarks>
+		public Browser WebAssemblyBrowser { get; set; } = Browser.Chrome;
 	}
 }
diff --git a/src/Uno.UITest.Helpers/Browser.cs b/src/Uno.UITest.Helpers/Browser.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Linq;
+
+namespace Uno.UITests.Helpers
+{
+	/// <summary>
+	/// Supported web browsers for UI tests
+	/// </summary>
+	public enum Browser
+	{
+		Chrome,
+
+		/// <summary>
+		/// The **CHROMIUM Based** Edge web browser
+		/// </summary>
+		Edge
+	}
+}
diff --git a/src/Uno.UITest.Puppeteer/ChromeAppConfigurator.cs b/src/Uno.UITest.Puppeteer/ChromeAppConfigurator.cs
diff --git a/src/Uno.UITest.Puppeteer/ConfigureApp.cs b/src/Uno.UITest.Puppeteer/ConfigureApp.cs
@@ -6,7 +6,6 @@ namespace Uno.UITest.Selenium
 {
 	public static class ConfigureApp
 	{
-		public static ChromeAppConfigurator WebAssembly =>
-			new ChromeAppConfigurator();
+		public static SeleniumAppConfigurator WebAssembly => new SeleniumAppConfigurator();
 	}
 }