Skip to content

Commit 7381ddb

Browse files
aguspeaguspe
committed
Merge remote-tracking branch 'upstream/rb_bidi_nav' into rb_bidi_nav
2 parents edfe8dc + cb6d24f commit 7381ddb

15 files changed

+94
-72
lines changed

‎common/repositories.bzl

+25-25
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ def pin_browsers():
1111

1212
http_archive(
1313
name = "linux_firefox",
14-
url = "https://ftp.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/en-US/firefox-132.0.1.tar.bz2",
15-
sha256 = "ecdcb4787263cacd31aa3a1b62c14f1d3b69af44a0b40f9eb040852f401097c1",
14+
url = "https://ftp.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/en-US/firefox-132.0.2.tar.bz2",
15+
sha256 = "777d47f8b8710ab450582dc0dc0cdf8f43c2291249b3eaf740ee28ee34cda139",
1616
build_file_content = """
1717
load("@aspect_rules_js//js:defs.bzl", "js_library")
1818
package(default_visibility = ["//visibility:public"])
@@ -33,8 +33,8 @@ js_library(
3333

3434
dmg_archive(
3535
name = "mac_firefox",
36-
url = "https://ftp.mozilla.org/pub/firefox/releases/132.0.1/mac/en-US/Firefox%20132.0.1.dmg",
37-
sha256 = "409c0bdb4e434c1191b71504626f8165b01e2582e561a870591940186614be2e",
36+
url = "https://ftp.mozilla.org/pub/firefox/releases/132.0.2/mac/en-US/Firefox%20132.0.2.dmg",
37+
sha256 = "233251c46eb4964868d815a9233cab855ac6160736310771a67af93a9b78224d",
3838
build_file_content = """
3939
load("@aspect_rules_js//js:defs.bzl", "js_library")
4040
package(default_visibility = ["//visibility:public"])
@@ -50,8 +50,8 @@ js_library(
5050

5151
http_archive(
5252
name = "linux_beta_firefox",
53-
url = "https://ftp.mozilla.org/pub/firefox/releases/133.0b6/linux-x86_64/en-US/firefox-133.0b6.tar.bz2",
54-
sha256 = "0f600dd3225ca6824004d28449e94d3768012f49eaea5506c618a199f234486e",
53+
url = "https://ftp.mozilla.org/pub/firefox/releases/133.0b9/linux-x86_64/en-US/firefox-133.0b9.tar.bz2",
54+
sha256 = "5c9f79912bfbf892d2b676973a26ffc078ee9b8fd9b791bfa856db030e657750",
5555
build_file_content = """
5656
load("@aspect_rules_js//js:defs.bzl", "js_library")
5757
package(default_visibility = ["//visibility:public"])
@@ -72,8 +72,8 @@ js_library(
7272

7373
dmg_archive(
7474
name = "mac_beta_firefox",
75-
url = "https://ftp.mozilla.org/pub/firefox/releases/133.0b6/mac/en-US/Firefox%20133.0b6.dmg",
76-
sha256 = "a6be00e4471d07eefc149a73e564232f2051fa8a39c1e12385550c8822f128b5",
75+
url = "https://ftp.mozilla.org/pub/firefox/releases/133.0b9/mac/en-US/Firefox%20133.0b9.dmg",
76+
sha256 = "0eb0fabe9216dc80c2ca403dd2eba935d71f2bdc1dea1d1cc37f03666ef094d1",
7777
build_file_content = """
7878
load("@aspect_rules_js//js:defs.bzl", "js_library")
7979
package(default_visibility = ["//visibility:public"])
@@ -123,10 +123,10 @@ js_library(
123123

124124
pkg_archive(
125125
name = "mac_edge",
126-
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/1225faee-37ac-4c03-8f2b-153353d900c6/MicrosoftEdge-130.0.2849.80.pkg",
127-
sha256 = "a0f3353555a7057158fd0335ecc783a45e1ed5bf38da9975396b63008591af80",
126+
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/08b226c9-fbe8-43c0-94fe-ed9c3eeb8f59/MicrosoftEdge-131.0.2903.51.pkg",
127+
sha256 = "5bc1eab86bb315aa9f2cd2b7d9afe072df35280f6e6d1a9ca9c108d95bda8acd",
128128
move = {
129-
"MicrosoftEdge-130.0.2849.80.pkg/Payload/Microsoft Edge.app": "Edge.app",
129+
"MicrosoftEdge-131.0.2903.51.pkg/Payload/Microsoft Edge.app": "Edge.app",
130130
},
131131
build_file_content = """
132132
load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -143,8 +143,8 @@ js_library(
143143

144144
deb_archive(
145145
name = "linux_edge",
146-
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_130.0.2849.80-1_amd64.deb",
147-
sha256 = "1b6f5743703e6da81c65c28dbcfd949d605466e226acc7cde9efbd4beabfa05d",
146+
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_131.0.2903.51-1_amd64.deb",
147+
sha256 = "8aad12c97bcae417ff9cc4251b75211eeda7f1513312dc57b2f744e824e028c0",
148148
build_file_content = """
149149
load("@aspect_rules_js//js:defs.bzl", "js_library")
150150
package(default_visibility = ["//visibility:public"])
@@ -165,8 +165,8 @@ js_library(
165165

166166
http_archive(
167167
name = "linux_edgedriver",
168-
url = "https://msedgedriver.azureedge.net/130.0.2849.78/edgedriver_linux64.zip",
169-
sha256 = "aec868f31bd714a5c12405f6fd6e0e7bfb3d0d06ae79690ecffde4af73da2075",
168+
url = "https://msedgedriver.azureedge.net/131.0.2903.52/edgedriver_linux64.zip",
169+
sha256 = "ddbeda7cec5ed16b96c3cf0f6759de30e4f3726da9da31bfba1371ccd8fcfd14",
170170
build_file_content = """
171171
load("@aspect_rules_js//js:defs.bzl", "js_library")
172172
package(default_visibility = ["//visibility:public"])
@@ -182,8 +182,8 @@ js_library(
182182

183183
http_archive(
184184
name = "mac_edgedriver",
185-
url = "https://msedgedriver.azureedge.net/130.0.2849.81/edgedriver_mac64.zip",
186-
sha256 = "da719a1170c2e93a88186dd9dabe485dda816280539522af03535d6c02eb1943",
185+
url = "https://msedgedriver.azureedge.net/131.0.2903.52/edgedriver_mac64.zip",
186+
sha256 = "719f54eb9376df5963e80da727c8ab8bacf6a1f57b785602a53a22fe330bb160",
187187
build_file_content = """
188188
load("@aspect_rules_js//js:defs.bzl", "js_library")
189189
package(default_visibility = ["//visibility:public"])
@@ -199,8 +199,8 @@ js_library(
199199

200200
http_archive(
201201
name = "linux_chrome",
202-
url = "https://storage.googleapis.com/chrome-for-testing-public/130.0.6723.116/linux64/chrome-linux64.zip",
203-
sha256 = "3e71b99204dc191a8692048526a4ad41803b8b9035ea4ef14eb9b1d37331e1f1",
202+
url = "https://storage.googleapis.com/chrome-for-testing-public/131.0.6778.69/linux64/chrome-linux64.zip",
203+
sha256 = "3e33f61511e5e9dabac0d7a57b4bb975555ed1d4dababa7898205c030f82e4e3",
204204
build_file_content = """
205205
load("@aspect_rules_js//js:defs.bzl", "js_library")
206206
package(default_visibility = ["//visibility:public"])
@@ -221,8 +221,8 @@ js_library(
221221

222222
http_archive(
223223
name = "mac_chrome",
224-
url = "https://storage.googleapis.com/chrome-for-testing-public/130.0.6723.116/mac-x64/chrome-mac-x64.zip",
225-
sha256 = "2f535efa4d92c9aa3c7a1fd896ae4088d6a306150649bb7c1e6ef20f7d536476",
224+
url = "https://storage.googleapis.com/chrome-for-testing-public/131.0.6778.69/mac-x64/chrome-mac-x64.zip",
225+
sha256 = "72a52967c80f9f145856d08d91052eaa27f6b951f9a4d8ab279f192b98784e41",
226226
strip_prefix = "chrome-mac-x64",
227227
patch_cmds = [
228228
"mv 'Google Chrome for Testing.app' Chrome.app",
@@ -243,8 +243,8 @@ js_library(
243243

244244
http_archive(
245245
name = "linux_chromedriver",
246-
url = "https://storage.googleapis.com/chrome-for-testing-public/130.0.6723.116/linux64/chromedriver-linux64.zip",
247-
sha256 = "35b6751942cb589e8bde4733cf6dc7a1484693a56004e5dc8d994beede19e847",
246+
url = "https://storage.googleapis.com/chrome-for-testing-public/131.0.6778.69/linux64/chromedriver-linux64.zip",
247+
sha256 = "afc7b41aa0e1606e8cc177c776287d836635690964e39eab1ed94d63a0c96be2",
248248
strip_prefix = "chromedriver-linux64",
249249
build_file_content = """
250250
load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -261,8 +261,8 @@ js_library(
261261

262262
http_archive(
263263
name = "mac_chromedriver",
264-
url = "https://storage.googleapis.com/chrome-for-testing-public/130.0.6723.116/mac-x64/chromedriver-mac-x64.zip",
265-
sha256 = "f8f71dfbed7dfe7255b2a1abda3cf28cc4d661f6f653dc1282735c703c86b865",
264+
url = "https://storage.googleapis.com/chrome-for-testing-public/131.0.6778.69/mac-x64/chromedriver-mac-x64.zip",
265+
sha256 = "92583e52f601951d3e0849891239bb2f6ff00dd8f8fd6c908473cc21c0533dd2",
266266
strip_prefix = "chromedriver-mac-x64",
267267
build_file_content = """
268268
load("@aspect_rules_js//js:defs.bzl", "js_library")

‎dotnet/test/chrome/ChromeSpecificTests.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,18 @@
1919

2020
using NUnit.Framework;
2121
using OpenQA.Selenium.Environment;
22+
using System.Threading.Tasks;
2223

2324
namespace OpenQA.Selenium.Chrome
2425
{
2526
[TestFixture]
2627
public class ChromeSpecificTests : DriverTestFixture
2728
{
2829
[OneTimeTearDown]
29-
public void RunAfterAnyTests()
30+
public async Task RunAfterAnyTestsAsync()
3031
{
3132
EnvironmentManager.Instance.CloseCurrentDriver();
32-
EnvironmentManager.Instance.WebServer.Stop();
33+
await EnvironmentManager.Instance.WebServer.StopAsync();
3334
}
3435
}
3536
}

‎dotnet/test/common/AssemblyFixture.cs

+7-6
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
using NUnit.Framework;
2121
using OpenQA.Selenium.Environment;
22+
using System.Threading.Tasks;
2223

2324
namespace OpenQA.Selenium
2425
{
@@ -31,25 +32,25 @@ public AssemblyFixture()
3132
}
3233

3334
[OneTimeSetUp]
34-
public void RunBeforeAnyTest()
35+
public async Task RunBeforeAnyTestAsync()
3536
{
3637
Internal.Logging.Log.SetLevel(Internal.Logging.LogEventLevel.Trace);
3738

38-
EnvironmentManager.Instance.WebServer.Start();
39+
await EnvironmentManager.Instance.WebServer.StartAsync();
3940
if (EnvironmentManager.Instance.Browser == Browser.Remote)
4041
{
41-
EnvironmentManager.Instance.RemoteServer.Start();
42+
await EnvironmentManager.Instance.RemoteServer.StartAsync();
4243
}
4344
}
4445

4546
[OneTimeTearDown]
46-
public void RunAfterAnyTests()
47+
public async Task RunAfterAnyTestsAsync()
4748
{
4849
EnvironmentManager.Instance.CloseCurrentDriver();
49-
EnvironmentManager.Instance.WebServer.Stop();
50+
await EnvironmentManager.Instance.WebServer.StopAsync();
5051
if (EnvironmentManager.Instance.Browser == Browser.Remote)
5152
{
52-
EnvironmentManager.Instance.RemoteServer.Stop();
53+
await EnvironmentManager.Instance.RemoteServer.StopAsync();
5354
}
5455
}
5556
}

‎dotnet/test/common/Environment/EnvironmentManager.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -199,11 +199,11 @@ private EnvironmentManager()
199199
{
200200
if (remoteServer != null)
201201
{
202-
remoteServer.Stop();
202+
remoteServer.StopAsync().Wait();
203203
}
204204
if (webServer != null)
205205
{
206-
webServer.Stop();
206+
webServer.StopAsync().Wait();
207207
}
208208
CloseCurrentDriver();
209209
}

‎dotnet/test/common/Environment/RemoteSeleniumServer.cs

+5-4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
using System.IO;
2323
using System.Net;
2424
using System.Net.Http;
25+
using System.Threading.Tasks;
2526

2627
namespace OpenQA.Selenium.Environment
2728
{
@@ -38,7 +39,7 @@ public RemoteSeleniumServer(string projectRoot, bool autoStartServer)
3839
autoStart = autoStartServer;
3940
}
4041

41-
public void Start()
42+
public async Task StartAsync()
4243
{
4344
if (autoStart && (webserverProcess == null || webserverProcess.HasExited))
4445
{
@@ -67,7 +68,7 @@ public void Start()
6768
{
6869
try
6970
{
70-
using var response = httpClient.GetAsync("http://localhost:6000/wd/hub/status").GetAwaiter().GetResult();
71+
using var response = await httpClient.GetAsync("http://localhost:6000/wd/hub/status");
7172

7273
if (response.StatusCode == HttpStatusCode.OK)
7374
{
@@ -86,15 +87,15 @@ public void Start()
8687
}
8788
}
8889

89-
public void Stop()
90+
public async Task StopAsync()
9091
{
9192
if (autoStart && webserverProcess != null && !webserverProcess.HasExited)
9293
{
9394
using var httpClient = new HttpClient();
9495

9596
try
9697
{
97-
using var response = httpClient.GetAsync("http://localhost:6000/selenium-server/driver?cmd=shutDownSeleniumServer").GetAwaiter().GetResult();
98+
using var response = await httpClient.GetAsync("http://localhost:6000/selenium-server/driver?cmd=shutDownSeleniumServer");
9899
}
99100
catch (Exception ex) when (ex is HttpRequestException || ex is TimeoutException)
100101
{

‎dotnet/test/common/Environment/TestWebServer.cs

+5-4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
using System.Net.Http;
2626
using System.Runtime.InteropServices;
2727
using System.Text;
28+
using System.Threading.Tasks;
2829

2930
namespace OpenQA.Selenium.Environment
3031
{
@@ -50,7 +51,7 @@ public TestWebServer(string projectRoot, TestWebServerConfig config)
5051
this.port = config.Port;
5152
}
5253

53-
public void Start()
54+
public async Task StartAsync()
5455
{
5556
if (webserverProcess == null || webserverProcess.HasExited)
5657
{
@@ -146,7 +147,7 @@ public void Start()
146147
{
147148
try
148149
{
149-
using var response = httpClient.GetAsync(EnvironmentManager.Instance.UrlBuilder.LocalWhereIs("simpleTest.html")).GetAwaiter().GetResult();
150+
using var response = await httpClient.GetAsync(EnvironmentManager.Instance.UrlBuilder.LocalWhereIs("simpleTest.html"));
150151

151152
if (response.StatusCode == HttpStatusCode.OK)
152153
{
@@ -174,15 +175,15 @@ public void Start()
174175
}
175176
}
176177

177-
public void Stop()
178+
public async Task StopAsync()
178179
{
179180
if (webserverProcess != null)
180181
{
181182
using (var httpClient = new HttpClient())
182183
{
183184
try
184185
{
185-
using (httpClient.GetAsync(EnvironmentManager.Instance.UrlBuilder.LocalWhereIs("quitquitquit")).GetAwaiter().GetResult())
186+
using (await httpClient.GetAsync(EnvironmentManager.Instance.UrlBuilder.LocalWhereIs("quitquitquit")))
186187
{
187188

188189
}

‎dotnet/test/edge/AssemblyTeardown.cs

+5-4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
using NUnit.Framework;
2121
using OpenQA.Selenium.Environment;
22+
using System.Threading.Tasks;
2223

2324
namespace OpenQA.Selenium.Edge
2425
{
@@ -27,16 +28,16 @@ namespace OpenQA.Selenium.Edge
2728
public class MySetUpClass
2829
{
2930
[OneTimeSetUp]
30-
public void RunBeforeAnyTest()
31+
public async Task RunBeforeAnyTestAsync()
3132
{
32-
EnvironmentManager.Instance.WebServer.Start();
33+
await EnvironmentManager.Instance.WebServer.StartAsync();
3334
}
3435

3536
[OneTimeTearDown]
36-
public void RunAfterAnyTests()
37+
public async Task RunAfterAnyTestsAsync()
3738
{
3839
EnvironmentManager.Instance.CloseCurrentDriver();
39-
EnvironmentManager.Instance.WebServer.Stop();
40+
await EnvironmentManager.Instance.WebServer.StopAsync();
4041
}
4142
}
4243
}

‎dotnet/test/firefox/AssemblyTeardown.cs

+5-4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
using NUnit.Framework;
2121
using OpenQA.Selenium.Environment;
22+
using System.Threading.Tasks;
2223

2324
namespace OpenQA.Selenium.Firefox
2425
{
@@ -27,16 +28,16 @@ namespace OpenQA.Selenium.Firefox
2728
public class MySetUpClass
2829
{
2930
[OneTimeSetUp]
30-
public void RunBeforeAnyTest()
31+
public async Task RunBeforeAnyTestAsync()
3132
{
32-
EnvironmentManager.Instance.WebServer.Start();
33+
await EnvironmentManager.Instance.WebServer.StartAsync();
3334
}
3435

3536
[OneTimeTearDown]
36-
public void RunAfterAnyTests()
37+
public async Task RunAfterAnyTestsAsync()
3738
{
3839
EnvironmentManager.Instance.CloseCurrentDriver();
39-
EnvironmentManager.Instance.WebServer.Stop();
40+
await EnvironmentManager.Instance.WebServer.StopAsync();
4041
}
4142
}
4243
}

‎dotnet/test/ie/AssemblyTeardown.cs

+5-4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
using NUnit.Framework;
2121
using OpenQA.Selenium.Environment;
22+
using System.Threading.Tasks;
2223

2324
namespace OpenQA.Selenium.IE
2425
{
@@ -27,16 +28,16 @@ namespace OpenQA.Selenium.IE
2728
public class MySetUpClass
2829
{
2930
[OneTimeSetUp]
30-
public void RunBeforeAnyTest()
31+
public async Task RunBeforeAnyTestAsync()
3132
{
32-
EnvironmentManager.Instance.WebServer.Start();
33+
await EnvironmentManager.Instance.WebServer.StartAsync();
3334
}
3435

3536
[OneTimeTearDown]
36-
public void RunAfterAnyTests()
37+
public async Task RunAfterAnyTestsAsync()
3738
{
3839
EnvironmentManager.Instance.CloseCurrentDriver();
39-
EnvironmentManager.Instance.WebServer.Stop();
40+
await EnvironmentManager.Instance.WebServer.StopAsync();
4041
}
4142
}
4243
}

0 commit comments

Comments
 (0)