Skip to content

Commit 942e918

Browse files
authored
Merge branch 'trunk' into release-preparation-4.36.0
2 parents 0352225 + b731bb4 commit 942e918

File tree

3 files changed

+20
-16
lines changed

3 files changed

+20
-16
lines changed

common/repositories.bzl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,8 @@ js_library(
277277

278278
http_archive(
279279
name = "linux_beta_chrome",
280-
url = "https://storage.googleapis.com/chrome-for-testing-public/141.0.7390.16/linux64/chrome-linux64.zip",
281-
sha256 = "bdc9007ff717d4f23572ec4af4a4a8e2d69267585ff57d499ef37cf39f2dd229",
280+
url = "https://storage.googleapis.com/chrome-for-testing-public/141.0.7390.30/linux64/chrome-linux64.zip",
281+
sha256 = "ab6d601cff0cd7aad7293ed177a26afa0b109edc70b0596dbfa6c3bc47f9de3e",
282282
build_file_content = """
283283
load("@aspect_rules_js//js:defs.bzl", "js_library")
284284
package(default_visibility = ["//visibility:public"])
@@ -298,8 +298,8 @@ js_library(
298298
)
299299
http_archive(
300300
name = "mac_beta_chrome",
301-
url = "https://storage.googleapis.com/chrome-for-testing-public/141.0.7390.16/mac-x64/chrome-mac-x64.zip",
302-
sha256 = "f6b92982039152b6b52e9f39e6591016d66afb7a0252f3c0a09da12bc7431db1",
301+
url = "https://storage.googleapis.com/chrome-for-testing-public/141.0.7390.30/mac-x64/chrome-mac-x64.zip",
302+
sha256 = "c2e0d3cb31f639f18e5960c4b8cf1fb8425b57b71f0e71ed4694106676546a83",
303303
strip_prefix = "chrome-mac-x64",
304304
patch_cmds = [
305305
"mv 'Google Chrome for Testing.app' Chrome.app",
@@ -319,8 +319,8 @@ js_library(
319319
)
320320
http_archive(
321321
name = "linux_beta_chromedriver",
322-
url = "https://storage.googleapis.com/chrome-for-testing-public/141.0.7390.16/linux64/chromedriver-linux64.zip",
323-
sha256 = "c325fbbe40d0dd508233a6bf496819c2ba6e00a4576b9820638c9a85dc5ad2d6",
322+
url = "https://storage.googleapis.com/chrome-for-testing-public/141.0.7390.30/linux64/chromedriver-linux64.zip",
323+
sha256 = "3e76f4d4257ba0a9ef1c26b77ebbfea11faa88f752f2b024c42f2efb7f89433c",
324324
strip_prefix = "chromedriver-linux64",
325325
build_file_content = """
326326
load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -337,8 +337,8 @@ js_library(
337337

338338
http_archive(
339339
name = "mac_beta_chromedriver",
340-
url = "https://storage.googleapis.com/chrome-for-testing-public/141.0.7390.16/mac-x64/chromedriver-mac-x64.zip",
341-
sha256 = "76b7a6239d4d32f2ef75e0a1d6749b7de89dbe14589ffdd3b3c5bf7c32efbaf6",
340+
url = "https://storage.googleapis.com/chrome-for-testing-public/141.0.7390.30/mac-x64/chromedriver-mac-x64.zip",
341+
sha256 = "9e55df2791c5ec4d5524602c2f385a1a4e4dc4873de3874146420fe3ec6c9ffe",
342342
strip_prefix = "chromedriver-mac-x64",
343343
build_file_content = """
344344
load("@aspect_rules_js//js:defs.bzl", "js_library")

dotnet/src/webdriver/Chromium/ChromiumDriverService.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@ protected override string CommandLineArguments
163163
argsBuilder.Append(string.Format(CultureInfo.InvariantCulture, " --log-level={0}", this.LogLevel.ToString().ToUpperInvariant()));
164164
}
165165

166+
// Unconditionally redirect browser logs to the same log as the driver
167+
argsBuilder.Append(" --enable-chrome-logs");
166168

167169
return argsBuilder.ToString();
168170
}

dotnet/test/common/BiDi/WebExtension/WebExtensionTest.cs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,23 @@
1818
// </copyright>
1919

2020
using NUnit.Framework;
21-
using System;
2221
using System.IO;
2322
using System.Threading.Tasks;
2423

2524
namespace OpenQA.Selenium.BiDi.WebExtension;
2625

27-
[Ignore("""
28-
The following test suite wants to set driver arguments via Options, but it breaks CDP/DevTools tests.
29-
The desired arguments (for Chromium only?):
30-
--enable-unsafe-extension-debugging
31-
--remote-debugging-pipe
32-
Ignoring these tests for now. Hopefully https://github.com/SeleniumHQ/selenium/issues/15536 will be resolved soon.
33-
""")]
26+
[IgnoreBrowser(Selenium.Browser.Chrome, ChromiumIgnoreReason)]
27+
[IgnoreBrowser(Selenium.Browser.Edge, ChromiumIgnoreReason)]
3428
class WebExtensionTest : BiDiTestFixture
3529
{
30+
const string ChromiumIgnoreReason = """
31+
The following test suite wants to set driver arguments via Options, but it breaks CDP/DevTools tests.
32+
The desired arguments (for Chromium only?):
33+
--enable-unsafe-extension-debugging
34+
--remote-debugging-pipe
35+
Ignoring these tests for now. Hopefully https://github.com/SeleniumHQ/selenium/issues/15536 will be resolved soon.
36+
""";
37+
3638
[Test]
3739
public async Task CanInstallPathWebExtension()
3840
{

0 commit comments

Comments
 (0)