Skip to content

Commit 10f3317

Browse files
RenderMichaelRenderMichael
authored
Merge branch 'trunk' into proxy
2 parents b7b6f1b + 40ea8a4 commit 10f3317

File tree

77 files changed

+1064
-1023
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+1064
-1023
lines changed

‎common/repositories.bzl‎

Lines changed: 25 additions & 25 deletions
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.2/linux-x86_64/en-US/firefox-132.0.2.tar.bz2",
15-
sha256 = "777d47f8b8710ab450582dc0dc0cdf8f43c2291249b3eaf740ee28ee34cda139",
14+
url = "https://ftp.mozilla.org/pub/firefox/releases/133.0/linux-x86_64/en-US/firefox-133.0.tar.bz2",
15+
sha256 = "63cb097174d429043ad128341358d14cdb5d4c9d05d035d9e3094634ceaf22c2",
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.2/mac/en-US/Firefox%20132.0.2.dmg",
37-
sha256 = "233251c46eb4964868d815a9233cab855ac6160736310771a67af93a9b78224d",
36+
url = "https://ftp.mozilla.org/pub/firefox/releases/133.0/mac/en-US/Firefox%20133.0.dmg",
37+
sha256 = "02c76e21d64f21d4e45b1205717ccd0736a75f2a50b01c74b25b17e374447a76",
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.0b9/linux-x86_64/en-US/firefox-133.0b9.tar.bz2",
54-
sha256 = "5c9f79912bfbf892d2b676973a26ffc078ee9b8fd9b791bfa856db030e657750",
53+
url = "https://ftp.mozilla.org/pub/firefox/releases/134.0b5/linux-x86_64/en-US/firefox-134.0b5.tar.bz2",
54+
sha256 = "9688f50d2bba71c7781e7f46100e97223d469d37197cf99511a2b2e27efd50a2",
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.0b9/mac/en-US/Firefox%20133.0b9.dmg",
76-
sha256 = "0eb0fabe9216dc80c2ca403dd2eba935d71f2bdc1dea1d1cc37f03666ef094d1",
75+
url = "https://ftp.mozilla.org/pub/firefox/releases/134.0b5/mac/en-US/Firefox%20134.0b5.dmg",
76+
sha256 = "5c6d02d149637e963c55c741ebed98a8dacfa93c90e99065981bbdd9d511a0f1",
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/08b226c9-fbe8-43c0-94fe-ed9c3eeb8f59/MicrosoftEdge-131.0.2903.51.pkg",
127-
sha256 = "5bc1eab86bb315aa9f2cd2b7d9afe072df35280f6e6d1a9ca9c108d95bda8acd",
126+
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/a310bc51-4dc2-4780-9677-41f3ecf37e31/MicrosoftEdge-131.0.2903.86.pkg",
127+
sha256 = "77dc0bf6d465815d3414a1b52d506323619c9debb12f9feb85ec4ad2c7e58585",
128128
move = {
129-
"MicrosoftEdge-131.0.2903.51.pkg/Payload/Microsoft Edge.app": "Edge.app",
129+
"MicrosoftEdge-131.0.2903.86.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_131.0.2903.51-1_amd64.deb",
147-
sha256 = "8aad12c97bcae417ff9cc4251b75211eeda7f1513312dc57b2f744e824e028c0",
146+
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_131.0.2903.86-1_amd64.deb",
147+
sha256 = "4c7844e51ffefbf5a595f3d93e633481c6081f0fd954d15cc08066ea23ddacf3",
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/131.0.2903.52/edgedriver_linux64.zip",
169-
sha256 = "ddbeda7cec5ed16b96c3cf0f6759de30e4f3726da9da31bfba1371ccd8fcfd14",
168+
url = "https://msedgedriver.azureedge.net/131.0.2903.84/edgedriver_linux64.zip",
169+
sha256 = "13b8024056a2ae72dfc45907213212756ffaf52567fa2b367acadd20badfb4bb",
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/131.0.2903.56/edgedriver_mac64.zip",
186-
sha256 = "4f4d1d5b45849677f8d8e706f7b5ca9ebb99f40ed3b4ee203c2535a3429e0d5b",
185+
url = "https://msedgedriver.azureedge.net/131.0.2903.84/edgedriver_mac64.zip",
186+
sha256 = "288c7b38d24a0650ca60e9e2a231c0c71976adc37be9e11e777e0596c40b3878",
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/131.0.6778.85/linux64/chrome-linux64.zip",
203-
sha256 = "3a6d928b0002ec012a53b6bb65dcaf95add008adc223c961d566d824982a767e",
202+
url = "https://storage.googleapis.com/chrome-for-testing-public/131.0.6778.87/linux64/chrome-linux64.zip",
203+
sha256 = "5ed0d25537b964cdf826224165a80d125ae67bbb980065c2f1e665dae6686904",
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/131.0.6778.85/mac-x64/chrome-mac-x64.zip",
225-
sha256 = "e26a606e2a3da403c6e1e93617a7b51ee010706614eb88de5b16470276e0896b",
224+
url = "https://storage.googleapis.com/chrome-for-testing-public/131.0.6778.87/mac-x64/chrome-mac-x64.zip",
225+
sha256 = "a9ab895b3ab102973f224f35bef6f0336b690f03cc5fbb73110bf448fe30ce70",
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/131.0.6778.85/linux64/chromedriver-linux64.zip",
247-
sha256 = "33910b16568feabd2b50a26a2c4456d154c760d6e28347427f99c025661a4f3e",
246+
url = "https://storage.googleapis.com/chrome-for-testing-public/131.0.6778.87/linux64/chromedriver-linux64.zip",
247+
sha256 = "bb0c5ee6594453258b328b838adc194ed0df000f2a6e5ead306b637a995e387b",
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/131.0.6778.85/mac-x64/chromedriver-mac-x64.zip",
265-
sha256 = "ee194eba1d52dea61dfbf08b05a2ce139660e9c7d20d15024c3a0757ac4a5fcb",
264+
url = "https://storage.googleapis.com/chrome-for-testing-public/131.0.6778.87/mac-x64/chromedriver-mac-x64.zip",
265+
sha256 = "9fa91a7b7e969cbd6edb089e14b8db2189353519640dcc84c067369918bfb04f",
266266
strip_prefix = "chromedriver-mac-x64",
267267
build_file_content = """
268268
load("@aspect_rules_js//js:defs.bzl", "js_library")

‎dotnet/src/webdriver/Interactions/ActionSequence.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ public int Count
7272
/// Gets the input device for this Action sequence.
7373
/// </summary>
7474
[Obsolete("This property has been renamed to InputDevice and will be removed in a future version")]
75+
[CLSCompliant(false)]
7576
public InputDevice inputDevice => InputDevice;
7677

7778
/// <summary>

‎dotnet/src/webdriver/Interactions/Actions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ private InputDevice FindDeviceById(string name)
138138

139139
if (id == name)
140140
{
141-
return sequence.inputDevice;
141+
return sequence.InputDevice;
142142
}
143143
}
144144

‎dotnet/test/common/AlertsTest.cs‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void ShouldAllowUsersToAcceptAnAlertManually()
4848
alert.Accept();
4949

5050
// If we can perform any action, we're good to go
51-
Assert.AreEqual("Testing Alerts", driver.Title);
51+
Assert.That(driver.Title, Is.EqualTo("Testing Alerts"));
5252
}
5353

5454
[Test]
@@ -81,7 +81,7 @@ public void ShouldAllowUsersToAcceptAnAlertWithNoTextManually()
8181
alert.Accept();
8282

8383
// If we can perform any action, we're good to go
84-
Assert.AreEqual("Testing Alerts", driver.Title);
84+
Assert.That(driver.Title, Is.EqualTo("Testing Alerts"));
8585
}
8686

8787
[Test]
@@ -95,7 +95,7 @@ public void ShouldAllowUsersToDismissAnAlertManually()
9595
alert.Dismiss();
9696

9797
// If we can perform any action, we're good to go
98-
Assert.AreEqual("Testing Alerts", driver.Title);
98+
Assert.That(driver.Title, Is.EqualTo("Testing Alerts"));
9999
}
100100

101101
[Test]
@@ -109,7 +109,7 @@ public void ShouldAllowAUserToAcceptAPrompt()
109109
alert.Accept();
110110

111111
// If we can perform any action, we're good to go
112-
Assert.AreEqual("Testing Prompt", driver.Title);
112+
Assert.That(driver.Title, Is.EqualTo("Testing Prompt"));
113113
}
114114

115115
[Test]
@@ -123,7 +123,7 @@ public void ShouldAllowAUserToDismissAPrompt()
123123
alert.Dismiss();
124124

125125
// If we can perform any action, we're good to go
126-
Assert.AreEqual("Testing Prompt", driver.Title);
126+
Assert.That(driver.Title, Is.EqualTo("Testing Prompt"));
127127
}
128128

129129
[Test]
@@ -138,7 +138,7 @@ public void ShouldAllowAUserToSetTheValueOfAPrompt()
138138
alert.Accept();
139139

140140
string result = driver.FindElement(By.Id("text")).Text;
141-
Assert.AreEqual("cheese", result);
141+
Assert.That(result, Is.EqualTo("cheese"));
142142
}
143143

144144
[Test]
@@ -173,7 +173,7 @@ public void ShouldAllowTheUserToGetTheTextOfAnAlert()
173173
string value = alert.Text;
174174
alert.Accept();
175175

176-
Assert.AreEqual("cheese", value);
176+
Assert.That(value, Is.EqualTo("cheese"));
177177
}
178178

179179
[Test]
@@ -187,7 +187,7 @@ public void ShouldAllowTheUserToGetTheTextOfAPrompt()
187187
string value = alert.Text;
188188
alert.Accept();
189189

190-
Assert.AreEqual("Enter something", value);
190+
Assert.That(value, Is.EqualTo("Enter something"));
191191
}
192192

193193
[Test]
@@ -222,7 +222,7 @@ public void ShouldAllowUsersToAcceptAnAlertInAFrame()
222222
alert.Accept();
223223

224224
// If we can perform any action, we're good to go
225-
Assert.AreEqual("Testing Alerts", driver.Title);
225+
Assert.That(driver.Title, Is.EqualTo("Testing Alerts"));
226226
}
227227

228228
[Test]
@@ -244,7 +244,7 @@ public void ShouldAllowUsersToAcceptAnAlertInANestedFrame()
244244
alert.Accept();
245245

246246
// If we can perform any action, we're good to go
247-
Assert.AreEqual("Testing Alerts", driver.Title);
247+
Assert.That(driver.Title, Is.EqualTo("Testing Alerts"));
248248
}
249249

250250
[Test]
@@ -298,7 +298,7 @@ public void PromptShouldUseDefaultValueIfNoKeysSent()
298298

299299
IWebElement element = driver.FindElement(By.Id("text"));
300300
WaitFor(ElementTextToEqual(element, "This is a default value"), "Element text was not 'This is a default value'");
301-
Assert.AreEqual("This is a default value", element.Text);
301+
Assert.That(element.Text, Is.EqualTo("This is a default value"));
302302
}
303303

304304
[Test]
@@ -311,7 +311,7 @@ public void PromptShouldHaveNullValueIfDismissed()
311311
alert.Dismiss();
312312
IWebElement element = driver.FindElement(By.Id("text"));
313313
WaitFor(ElementTextToEqual(element, "null"), "Element text was not 'null'");
314-
Assert.AreEqual("null", element.Text);
314+
Assert.That(element.Text, Is.EqualTo("null"));
315315
}
316316

317317
[Test]
@@ -349,10 +349,10 @@ function displayTwoPrompts() {
349349

350350
IWebElement element1 = driver.FindElement(By.Id("text1"));
351351
WaitFor(ElementTextToEqual(element1, "brie"), "Element text was not 'brie'");
352-
Assert.AreEqual("brie", element1.Text);
352+
Assert.That(element1.Text, Is.EqualTo("brie"));
353353
IWebElement element2 = driver.FindElement(By.Id("text2"));
354354
WaitFor(ElementTextToEqual(element2, "cheddar"), "Element text was not 'cheddar'");
355-
Assert.AreEqual("cheddar", element2.Text);
355+
Assert.That(element2.Text, Is.EqualTo("cheddar"));
356356
}
357357

358358
[Test]
@@ -370,7 +370,7 @@ public void ShouldHandleAlertOnPageLoad()
370370
string value = alert.Text;
371371
alert.Accept();
372372

373-
Assert.AreEqual("onload", value);
373+
Assert.That(value, Is.EqualTo("onload"));
374374
IWebElement element = driver.FindElement(By.TagName("p"));
375375
WaitFor(ElementTextToEqual(element, "Page with onload event handler"), "Element text was not 'Page with onload event handler'");
376376
}
@@ -387,7 +387,7 @@ public void ShouldHandleAlertOnPageLoadUsingGet()
387387
string value = alert.Text;
388388
alert.Accept();
389389

390-
Assert.AreEqual("onload", value);
390+
Assert.That(value, Is.EqualTo("onload"));
391391
WaitFor(ElementTextToEqual(driver.FindElement(By.TagName("p")), "Page with onload event handler"), "Could not find element with text 'Page with onload event handler'");
392392
}
393393

@@ -412,7 +412,7 @@ public void ShouldNotHandleAlertInAnotherWindow()
412412
driver.FindElement(By.Id("open-new-window")).Click();
413413
List<String> allWindows = new List<string>(driver.WindowHandles);
414414
allWindows.Remove(mainWindow);
415-
Assert.AreEqual(1, allWindows.Count);
415+
Assert.That(allWindows, Has.One.Items);
416416
onloadWindow = allWindows[0];
417417

418418
Assert.That(() =>
@@ -472,8 +472,8 @@ public void ShouldHandleAlertOnFormSubmit()
472472
string text = alert.Text;
473473
alert.Accept();
474474

475-
Assert.AreEqual("Tasty cheese", text);
476-
Assert.AreEqual("Testing Alerts", driver.Title);
475+
Assert.That(text, Is.EqualTo("Tasty cheese"));
476+
Assert.That(driver.Title, Is.EqualTo("Testing Alerts"));
477477
}
478478

479479
private IAlert AlertToBePresent()

‎dotnet/test/common/BiDi/Browser/BrowserTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public async Task CanGetUserContexts()
4141
var userContexts = await bidi.Browser.GetUserContextsAsync();
4242

4343
Assert.That(userContexts, Is.Not.Null);
44-
Assert.That(userContexts.Count, Is.GreaterThanOrEqualTo(2));
44+
Assert.That(userContexts, Has.Count.GreaterThanOrEqualTo(2));
4545
Assert.That(userContexts, Does.Contain(userContext1));
4646
Assert.That(userContexts, Does.Contain(userContext2));
4747
}

‎dotnet/test/common/BiDi/Network/NetworkEventsTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public async Task CanListenToBeforeRequestSentEventWithCookie()
9999

100100
var req = await tcs.Task.WaitAsync(TimeSpan.FromSeconds(5));
101101

102-
Assert.That(req.Request.Cookies.Count, Is.EqualTo(1));
102+
Assert.That(req.Request.Cookies, Has.Count.EqualTo(1));
103103
Assert.That(req.Request.Cookies[0].Name, Is.EqualTo("foo"));
104104
Assert.That((req.Request.Cookies[0].Value as BytesValue.String).Value, Is.EqualTo("bar"));
105105
}

‎dotnet/test/common/BiDi/Script/ScriptCommandsTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public async Task CanGetAllRealms()
3434
var realms = await bidi.Script.GetRealmsAsync();
3535

3636
Assert.That(realms, Is.Not.Null);
37-
Assert.That(realms.Count, Is.EqualTo(2));
37+
Assert.That(realms, Has.Count.EqualTo(2));
3838

3939
Assert.That(realms[0], Is.AssignableFrom<RealmInfo.Window>());
4040
Assert.That(realms[0].Realm, Is.Not.Null);
@@ -51,7 +51,7 @@ public async Task CanGetAllRealmsByType()
5151
var realms = await bidi.Script.GetRealmsAsync(new() { Type = RealmType.Window });
5252

5353
Assert.That(realms, Is.Not.Null);
54-
Assert.That(realms.Count, Is.EqualTo(2));
54+
Assert.That(realms, Has.Count.EqualTo(2));
5555

5656
Assert.That(realms[0], Is.AssignableFrom<RealmInfo.Window>());
5757
Assert.That(realms[0].Realm, Is.Not.Null);

‎dotnet/test/common/BiDi/Storage/StorageTest.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ await context.Storage.SetCookieAsync(new("fish", "cod", UrlBuilder.HostName)
9494
var cookies = await context.Storage.GetCookiesAsync();
9595

9696
Assert.That(cookies, Is.Not.Null);
97-
Assert.That(cookies.Count, Is.EqualTo(1));
97+
Assert.That(cookies, Has.Count.EqualTo(1));
9898

9999
var cookie = cookies[0];
100100

@@ -119,7 +119,7 @@ public async Task CanGetAllCookies()
119119
var cookies = await bidi.Storage.GetCookiesAsync();
120120

121121
Assert.That(cookies, Is.Not.Null);
122-
Assert.That(cookies.Count, Is.EqualTo(2));
122+
Assert.That(cookies, Has.Count.EqualTo(2));
123123
Assert.That(cookies[0].Name, Is.EqualTo("key1"));
124124
Assert.That(cookies[1].Name, Is.EqualTo("key2"));
125125
}
@@ -157,7 +157,7 @@ public async Task CanDeleteCookieWithName()
157157
var cookies = await bidi.Storage.GetCookiesAsync();
158158

159159
Assert.That(cookies, Is.Not.Null);
160-
Assert.That(cookies.Count, Is.EqualTo(1));
160+
Assert.That(cookies, Has.Count.EqualTo(1));
161161
Assert.That(cookies[0].Name, Is.EqualTo("key2"));
162162
}
163163

0 commit comments

Comments
 (0)