Skip to content

Commit 9e465e5

Browse files
authored
Merge branch 'trunk' into py_cdp_fix
2 parents 408741a + 68ebd5f commit 9e465e5

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

dotnet/src/webdriver/Chromium/ChromiumDriverService.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,7 @@ protected override string CommandLineArguments
160160

161161
if (this.LogLevel != ChromiumDriverLogLevel.Default)
162162
{
163-
if (Enum.IsDefined(typeof(ChromiumDriverLogLevel), this.LogLevel))
164-
{
165-
argsBuilder.Append(string.Format(CultureInfo.InvariantCulture, " --log-level={0}", this.LogLevel.ToString().ToUpperInvariant()));
166-
}
163+
argsBuilder.Append(string.Format(CultureInfo.InvariantCulture, " --log-level={0}", this.LogLevel.ToString().ToUpperInvariant()));
167164
}
168165

169166

dotnet/src/webdriver/Firefox/FirefoxDriverService.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,13 @@ protected override DriverOptions GetDefaultDriverOptions()
104104
public string? LogPath { get; set; }
105105

106106
/// <summary>
107-
/// Disable truncation of long log lines in GeckoDriver.
107+
/// Gets or sets a value indicating whether to disable truncation of long log lines in GeckoDriver.
108108
/// </summary>
109-
public bool LogNoTruncate { get; set; }
109+
/// <remarks>
110+
/// A <see langword="null"/> value indicates no log truncation setting to specify.
111+
/// Set to <see langword="true"/> to disable truncation, or <see langword="false"/> to enable truncation.
112+
/// </remarks>
113+
public bool? LogTruncate { get; set; }
110114

111115
/// <summary>
112116
/// Directory in which GeckoDriver creates profiles.
@@ -199,7 +203,7 @@ protected override string CommandLineArguments
199203
argsBuilder.Append(" --jsdebugger");
200204
}
201205

202-
if (this.LogNoTruncate)
206+
if (this.LogTruncate is true)
203207
{
204208
argsBuilder.Append(" --log-no-truncate");
205209
}

javascript/selenium-webdriver/test/bidi/network_test.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ suite(
6969
await driver.navigate().refresh()
7070

7171
assert.equal(beforeRequestEvent.request.method, 'GET')
72+
await driver.wait(() => beforeRequestEvent.request.cookies.length > 0, 2000)
7273
assert.equal(beforeRequestEvent.request.cookies[0].name, 'north')
7374
assert.equal(beforeRequestEvent.request.cookies[0].value.value, 'biryani')
7475
const url = beforeRequestEvent.request.url
@@ -80,6 +81,7 @@ suite(
8081
})
8182
await driver.navigate().refresh()
8283

84+
await driver.wait(() => beforeRequestEvent.request.cookies.length > 1, 2000)
8385
assert.equal(beforeRequestEvent.request.cookies[1].name, 'south')
8486
assert.equal(beforeRequestEvent.request.cookies[1].value.value, 'dosa')
8587
})

0 commit comments

Comments
 (0)