Skip to content

Commit d72cd2a

Browse files
authored
Merge branch 'trunk' into blog-post-mirror-ghcr
2 parents 815d543 + ecd3a61 commit d72cd2a

19 files changed

Lines changed: 52 additions & 40 deletions

File tree

examples/dotnet/SeleniumDocs/BaseTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class BaseTest
1717
protected IWebDriver driver;
1818
protected Uri GridUrl;
1919
private Process _webserverProcess;
20-
private const string ServerJarName = "selenium-server-4.41.0.jar";
20+
private const string ServerJarName = "selenium-server-4.43.0.jar";
2121
private static readonly string BaseDirectory = AppContext.BaseDirectory;
2222
private const string RelativePathToGrid = "../../../../../";
2323
private readonly string _examplesDirectory = Path.GetFullPath(Path.Combine(BaseDirectory, RelativePathToGrid));

examples/dotnet/SeleniumDocs/Browsers/ChromeTest.cs

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
using System;
22
using System.IO;
33
using System.Linq;
4+
using System.Runtime.InteropServices;
45
using System.Text.RegularExpressions;
6+
using System.Threading.Tasks;
57
using Microsoft.VisualStudio.TestTools.UnitTesting;
68
using OpenQA.Selenium;
9+
using OpenQA.Selenium.BiDi;
10+
using OpenQA.Selenium.BiDi.WebExtension;
711
using OpenQA.Selenium.Chrome;
812
using OpenQA.Selenium.Chromium;
913

@@ -22,7 +26,7 @@ public void Cleanup()
2226
{
2327
File.Delete(_logLocation);
2428
}
25-
driver.Quit();
29+
driver?.Quit();
2630
}
2731

2832
[TestMethod]
@@ -58,17 +62,27 @@ public void SetBrowserLocation()
5862
}
5963

6064
[TestMethod]
61-
public void InstallExtension()
65+
public async Task InstallExtension()
6266
{
63-
var options = new ChromeOptions();
64-
var baseDir = AppDomain.CurrentDomain.BaseDirectory;
65-
var extensionFilePath = Path.Combine(baseDir, "../../../Extensions/webextensions-selenium-example.crx");
67+
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
68+
{
69+
Assert.Inconclusive("Extension install via BiDi is not supported on Windows");
70+
return;
71+
}
6672

67-
options.AddExtension(extensionFilePath);
68-
options.AddArgument("--disable-features=DisableLoadExtensionCommandLineSwitch");
73+
var options = new ChromeOptions();
74+
options.UseWebSocketUrl = true;
75+
options.AddArgument("--remote-debugging-pipe");
76+
options.AddArgument("--enable-unsafe-extension-debugging");
6977

7078
driver = new ChromeDriver(options);
7179

80+
var baseDir = AppDomain.CurrentDomain.BaseDirectory;
81+
var extensionDir = Path.GetFullPath(Path.Combine(baseDir, "../../../Extensions/webextensions-selenium-example"));
82+
83+
var bidi = await driver.AsBiDiAsync();
84+
await bidi.WebExtension.InstallAsync(new ExtensionPath(extensionDir));
85+
7286
driver.Url = "https://www.selenium.dev/selenium/web/blank.html";
7387

7488
IWebElement injected = driver.FindElement(By.Id("webextensions-selenium-example"));
@@ -163,7 +177,7 @@ private static string GetChromeLocation()
163177
{
164178
BrowserVersion = "stable"
165179
};
166-
return new DriverFinder(options).GetBrowserPath();
180+
return new DriverFinder(options).GetBrowserPathAsync().AsTask().GetAwaiter().GetResult();
167181
}
168182
}
169183
}

examples/dotnet/SeleniumDocs/Browsers/EdgeTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ private static string GetEdgeLocation()
157157
{
158158
BrowserVersion = "stable"
159159
};
160-
return new DriverFinder(options).GetBrowserPath();
160+
return new DriverFinder(options).GetBrowserPathAsync().AsTask().GetAwaiter().GetResult();
161161
}
162162
}
163163
}

examples/dotnet/SeleniumDocs/Browsers/FirefoxTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ private static string GetFirefoxLocation()
203203
{
204204
BrowserVersion = "stable"
205205
};
206-
return new DriverFinder(options).GetBrowserPath();
206+
return new DriverFinder(options).GetBrowserPathAsync().AsTask().GetAwaiter().GetResult();
207207
}
208208

209209
private void ResetGlobalLog()

examples/dotnet/SeleniumDocs/Drivers/ServiceTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void DriverPort()
3636

3737
private static string GetDriverLocation(ChromeOptions options)
3838
{
39-
return new DriverFinder(options).GetDriverPath();
39+
return new DriverFinder(options).GetDriverPathAsync().AsTask().GetAwaiter().GetResult();
4040
}
4141

4242
private static ChromeOptions GetLatestChromeOptions()

examples/dotnet/SeleniumDocs/Troubleshooting/LoggingTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using Microsoft.VisualStudio.TestTools.UnitTesting;
22
using OpenQA.Selenium;
33
using OpenQA.Selenium.Internal.Logging;
4+
using OpenQA.Selenium.Manager;
45
using OpenQA.Selenium.Remote;
56
using System;
67
using System.IO;
@@ -68,7 +69,7 @@ private void Info(string message)
6869

6970
private void LogMessage(string methodName, string message)
7071
{
71-
var getLoggerMethod = typeof(Log).GetMethod("GetLogger", System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic, new Type[] { typeof(Type) });
72+
var getLoggerMethod = typeof(Log).GetMethod("GetLogger", System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic, new Type[] { typeof(Type) });
7273

7374
var logger = getLoggerMethod.Invoke(null, new object[] { typeof(LoggingTest) });
7475

examples/python/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
selenium==4.41.0
2-
pytest==8.4.2
2+
pytest==9.0.3
33
trio==0.31.0
44
pytest-trio==0.8.0
55
pytest-rerunfailures==16.1

examples/python/tests/conftest.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ def server_old(request):
149149
os.path.abspath(__file__)
150150
)
151151
),
152-
"selenium-server-4.41.0.jar",
152+
"selenium-server-4.43.0.jar",
153153
)
154154

155155
def wait_for_server(url, timeout):
@@ -207,7 +207,7 @@ def server():
207207
)
208208
)
209209
),
210-
"selenium-server-4.41.0.jar",
210+
"selenium-server-4.43.0.jar",
211211
)
212212

213213
args = [
@@ -280,7 +280,7 @@ def grid_server():
280280
)
281281
)
282282
),
283-
"selenium-server-4.41.0.jar",
283+
"selenium-server-4.43.0.jar",
284284
)
285285

286286
args = [

examples/ruby/Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ gem 'rake', '~> 13.0'
77
gem 'rspec', '~> 3.0'
88
gem 'rubocop', '~> 1.35'
99
gem 'rubocop-rspec', '~> 3.0'
10-
gem 'selenium-devtools', '= 0.143.0'
11-
gem 'selenium-webdriver', '= 4.41.0'
10+
gem 'selenium-devtools', '= 0.147.0'
11+
gem 'selenium-webdriver', '= 4.43.0'

examples/ruby/Gemfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ GEM
5050
rubocop (~> 1.72, >= 1.72.1)
5151
ruby-progressbar (1.13.0)
5252
rubyzip (3.2.2)
53-
selenium-devtools (0.143.0)
53+
selenium-devtools (0.147.0)
5454
selenium-webdriver (~> 4.2)
55-
selenium-webdriver (4.41.0)
55+
selenium-webdriver (4.43.0)
5656
base64 (~> 0.2)
5757
logger (~> 1.4)
5858
rexml (~> 3.2, >= 3.2.5)
@@ -77,8 +77,8 @@ DEPENDENCIES
7777
rspec (~> 3.0)
7878
rubocop (~> 1.35)
7979
rubocop-rspec (~> 3.0)
80-
selenium-devtools (= 0.143.0)
81-
selenium-webdriver (= 4.41.0)
80+
selenium-devtools (= 0.147.0)
81+
selenium-webdriver (= 4.43.0)
8282

8383
BUNDLED WITH
8484
2.5.6

0 commit comments

Comments
 (0)