Update .NET test to properly use remote/grid

SeleniumHQ · Jun 4, 2021 · dca5756 · dca5756
1 parent b754461
commit dca5756
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/dotnet/test/common/CustomDriverConfigs/StableChannelRemoteChromeDriver.cs b/dotnet/test/common/CustomDriverConfigs/StableChannelRemoteChromeDriver.cs
@@ -0,0 +1,18 @@
+using OpenQA.Selenium.Chrome;
+using OpenQA.Selenium.Remote;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenQA.Selenium.Remote
+{
+    public class StableChannelRemoteChromeDriver : RemoteWebDriver
+    {
+        public StableChannelRemoteChromeDriver()
+            : base(new Uri("http://127.0.0.1:6000/wd/hub/"), new ChromeOptions())
+        {
+            this.FileDetector = new LocalFileDetector();
+        }
+    }
+}
diff --git a/dotnet/test/common/Environment/RemoteSeleniumServer.cs b/dotnet/test/common/Environment/RemoteSeleniumServer.cs
@@ -8,7 +8,7 @@ namespace OpenQA.Selenium.Environment
     public class RemoteSeleniumServer
     {
         private Process webserverProcess;
-        private string serverJarName = @"buck-out/gen/java/server/src/org/openqa/grid/selenium/selenium.jar";
+        private string serverJarName = @"java/server/src/org/openqa/selenium/grid/selenium_server_deploy.jar";
         private string projectRootPath;
         private bool autoStart;
 
@@ -41,14 +41,14 @@ public void Start()
                 string ieDriverExe = System.IO.Path.Combine(serviceDirectory, "IEDriverServer.exe");
                 string chromeDriverExe = System.IO.Path.Combine(serviceDirectory, "chromedriver.exe");
                 string geckoDriverExe = System.IO.Path.Combine(serviceDirectory, "geckodriver.exe");
-                string edgeDriverExe = System.IO.Path.Combine(serviceDirectory, "MicrosoftWebDriver.exe");
+                string edgeDriverExe = System.IO.Path.Combine(serviceDirectory, "msedgedriver.exe");
                 webserverProcess = new Process();
                 webserverProcess.StartInfo.FileName = "java.exe";
                 webserverProcess.StartInfo.Arguments = "-Dwebdriver.ie.driver=" + ieDriverExe
                                                      + " -Dwebdriver.gecko.driver=" + geckoDriverExe
                                                      + " -Dwebdriver.chrome.driver=" + chromeDriverExe
                                                      + " -Dwebdriver.edge.driver=" + edgeDriverExe
-                                                     + " -jar " + serverJarName + " -port 6000";
+                                                     + " -jar " + serverJarName + " standalone --port 6000";
                 webserverProcess.StartInfo.WorkingDirectory = projectRootPath;
                 webserverProcess.Start();
                 DateTime timeout = DateTime.Now.Add(TimeSpan.FromSeconds(30));