[dotnet] Allow to run tests w/o pinned browsers

SeleniumHQ · May 15, 2024 · 6978ea8 · 6978ea8
1 parent 03f626f
commit 6978ea8
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 1 deletion.
diff --git a/common/manager/BUILD.bazel b/common/manager/BUILD.bazel
@@ -1,6 +1,7 @@
 package(
     default_visibility = [
         "//dotnet/src/webdriver:__pkg__",
+        "//dotnet/test/common:__pkg__",
         "//java/src/org/openqa/selenium/manager:__pkg__",
         "//javascript/node/selenium-webdriver:__pkg__",
         "//py:__pkg__",

diff --git a/dotnet/src/webdriver/BUILD.bazel b/dotnet/src/webdriver/BUILD.bazel
@@ -113,18 +113,21 @@ copy_file(
     name = "manager-linux",
     src = "//common/manager:selenium-manager-linux",
     out = "manager/linux/selenium-manager",
+    visibility = ["//dotnet/test/common:__pkg__"],
 )
 
 copy_file(
     name = "manager-macos",
     src = "//common/manager:selenium-manager-macos",
     out = "manager/macos/selenium-manager",
+    visibility = ["//dotnet/test/common:__pkg__"],
 )
 
 copy_file(
     name = "manager-windows",
     src = "//common/manager:selenium-manager-windows",
     out = "manager/windows/selenium-manager.exe",
+    visibility = ["//dotnet/test/common:__pkg__"],
 )
 
 nuget_pack(

diff --git a/dotnet/test/common/BUILD.bazel b/dotnet/test/common/BUILD.bazel
@@ -18,6 +18,9 @@ filegroup(
     data = [
         "appconfig.json",
         "//common/src/web",
+        "//dotnet/src/webdriver:manager-linux",
+        "//dotnet/src/webdriver:manager-macos",
+        "//dotnet/src/webdriver:manager-windows",
         "//java/test/org/openqa/selenium/environment:appserver",
         "//java/test/org/openqa/selenium/environment:keystore",
         "//javascript/atoms",
@@ -39,6 +42,9 @@ csharp_library(
             "**/*Tests.cs",
         ],
     ),
+    data = [
+        "//common/manager:selenium-manager-macos",
+    ],
     target_frameworks = ["net7.0"],
     targeting_packs = [
         framework("nuget", "Microsoft.NETCore.App.Ref"),
@@ -54,6 +60,12 @@ csharp_library(
     ],
 )
 
+# copy_file(
+#     name = "manager-macos",
+#     src = "//common/manager:selenium-manager-macos",
+#     out = "manager/macos/selenium-manager",
+# )
+
 dotnet_nunit_test_suite(
     name = "AllTests",
     size = "large",

diff --git a/dotnet/test/common/Environment/EnvironmentManager.cs b/dotnet/test/common/Environment/EnvironmentManager.cs
@@ -5,6 +5,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Runtime.InteropServices;
 
 namespace OpenQA.Selenium.Environment
 {
@@ -23,9 +24,9 @@ public class EnvironmentManager
         private EnvironmentManager()
         {
             string dataFilePath;
+            var runfiles = Runfiles.Create();
             try
             {
-                var runfiles = Runfiles.Create();
                 dataFilePath = runfiles.Rlocation("_main/dotnet/test/common/appconfig.json");
             }
             catch (FileNotFoundException)
@@ -138,6 +139,30 @@ private EnvironmentManager()
                 projectRoot += "/_main";
             }
 
+            // Find selenium-manager binary.
+            try
+            {
+                string managerFilePath = "";
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                {
+                    managerFilePath = runfiles.Rlocation("_main/dotnet/src/webdriver/manager/windows/selenium-manager.exe");
+                }
+                else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+                {
+                    managerFilePath = runfiles.Rlocation("_main/dotnet/src/webdriver/manager/linux/selenium-manager");
+                }
+                else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                {
+                    managerFilePath = runfiles.Rlocation("_main/dotnet/src/webdriver/manager/macos/selenium-manager");
+                }
+
+                System.Environment.SetEnvironmentVariable("SE_MANAGER_PATH", managerFilePath);
+            }
+            catch (FileNotFoundException)
+            {
+                // Use the default one.
+            }
+
             webServer = new TestWebServer(projectRoot, webServerConfig);
             bool autoStartRemoteServer = false;
             if (browser == Browser.Remote)