Skip to content

Commit b2a604f

Browse files
RenderMichaelRenderMichael
authored
Merge branch 'trunk' into null-pinned-script
2 parents 8685510 + 9054e89 commit b2a604f

File tree

72 files changed

+1797
-319
lines changed

Some content is hidden

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

72 files changed

+1797
-319
lines changed

‎.github/workflows/ci-python.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,16 @@ jobs:
103103
- browser: safari
104104
os: macos
105105
- browser: chrome
106-
os: macos
106+
os: ubuntu
107+
- browser: edge
108+
os: ubuntu
109+
- browser: firefox
110+
os: ubuntu
107111
with:
108112
name: Integration Tests (${{ matrix.browser }}, ${{ matrix.os }})
109113
browser: ${{ matrix.browser }}
110114
os: ${{ matrix.os }}
111115
cache-key: py-browser-${{ matrix.browser }}
112-
run: bazel test --flaky_test_attempts 3 //py:test-${{ matrix.browser }}
116+
run: |
117+
bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:common-${{ matrix.browser }}-bidi
118+
bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-${{ matrix.browser }}

‎.skipped-tests‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
-//py:test-chrome-test/selenium/webdriver/chrome/chrome_launcher_tests.py
3232
-//py:test-chrome-test/selenium/webdriver/chrome/chrome_service_tests.py
3333
-//py:test-chrome-test/selenium/webdriver/chrome/proxy_tests.py
34+
-//py:test-edge-test/selenium/webdriver/edge/edge_launcher_tests.py
35+
-//py:test-edge-test/selenium/webdriver/edge/edge_service_tests.py
3436
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome
3537
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome-bidi
3638
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome-remote

‎README.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,18 @@ Run unit tests with:
317317
bazel test //py:unit
318318
```
319319

320+
To run common tests with a specific browser:
321+
322+
```sh
323+
bazel test //py:common-<browsername>
324+
```
325+
326+
To run common tests with a specific browser (include BiDi tests):
327+
328+
```sh
329+
bazel test //py:common-<browsername>-bidi
330+
```
331+
320332
To run tests with a specific browser:
321333

322334
```sh

‎dotnet/src/webdriver/DefaultFileDetector.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
// under the License.
1818
// </copyright>
1919

20+
using System.Diagnostics.CodeAnalysis;
21+
22+
#nullable enable
23+
2024
namespace OpenQA.Selenium
2125
{
2226
/// <summary>
@@ -31,7 +35,7 @@ public class DefaultFileDetector : IFileDetector
3135
/// </summary>
3236
/// <param name="keySequence">The sequence to test for file existence.</param>
3337
/// <returns>This method always returns <see langword="false"/> in this implementation.</returns>
34-
public bool IsFile(string keySequence)
38+
public bool IsFile([NotNullWhen(true)] string? keySequence)
3539
{
3640
return false;
3741
}

‎dotnet/src/webdriver/DetachedShadowRootException.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
// </copyright>
1919

2020
using System;
21-
using System.Runtime.Serialization;
21+
22+
#nullable enable
2223

2324
namespace OpenQA.Selenium
2425
{
@@ -41,7 +42,7 @@ public DetachedShadowRootException()
4142
/// a specified error message.
4243
/// </summary>
4344
/// <param name="message">The message that describes the error.</param>
44-
public DetachedShadowRootException(string message)
45+
public DetachedShadowRootException(string? message)
4546
: base(message)
4647
{
4748
}
@@ -54,7 +55,7 @@ public DetachedShadowRootException(string message)
5455
/// <param name="message">The error message that explains the reason for the exception.</param>
5556
/// <param name="innerException">The exception that is the cause of the current exception,
5657
/// or <see langword="null"/> if no inner exception is specified.</param>
57-
public DetachedShadowRootException(string message, Exception innerException)
58+
public DetachedShadowRootException(string? message, Exception? innerException)
5859
: base(message, innerException)
5960
{
6061
}

‎dotnet/src/webdriver/DevTools/CommandResponseException.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
using System;
2121

22+
#nullable enable
23+
2224
namespace OpenQA.Selenium.DevTools
2325
{
2426
/// <summary>
@@ -39,7 +41,7 @@ public CommandResponseException()
3941
/// Initializes a new instance of the <see cref="CommandResponseException"/> class with the specified message.
4042
/// </summary>
4143
/// <param name="message">The message of the exception.</param>
42-
public CommandResponseException(string message)
44+
public CommandResponseException(string? message)
4345
: base(message)
4446
{
4547
}
@@ -49,7 +51,7 @@ public CommandResponseException(string message)
4951
/// </summary>
5052
/// <param name="message">The message of the exception.</param>
5153
/// <param name="innerException">The inner exception for this exception.</param>
52-
public CommandResponseException(string message, Exception innerException)
54+
public CommandResponseException(string? message, Exception? innerException)
5355
: base(message, innerException)
5456
{
5557
}

‎dotnet/src/webdriver/DriverServiceNotFoundException.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@
1818
// </copyright>
1919

2020
using System;
21-
using System.Runtime.Serialization;
21+
22+
#nullable enable
2223

2324
namespace OpenQA.Selenium
2425
{
2526
/// <summary>
26-
/// The exception that is thrown when an element is not visible.
27+
/// The exception that is thrown when the driver service is not available.
2728
/// </summary>
2829
[Serializable]
2930
public class DriverServiceNotFoundException : WebDriverException
@@ -41,7 +42,7 @@ public DriverServiceNotFoundException()
4142
/// a specified error message.
4243
/// </summary>
4344
/// <param name="message">The message that describes the error.</param>
44-
public DriverServiceNotFoundException(string message)
45+
public DriverServiceNotFoundException(string? message)
4546
: base(message)
4647
{
4748
}
@@ -54,7 +55,7 @@ public DriverServiceNotFoundException(string message)
5455
/// <param name="message">The error message that explains the reason for the exception.</param>
5556
/// <param name="innerException">The exception that is the cause of the current exception,
5657
/// or <see langword="null"/> if no inner exception is specified.</param>
57-
public DriverServiceNotFoundException(string message, Exception innerException)
58+
public DriverServiceNotFoundException(string? message, Exception? innerException)
5859
: base(message, innerException)
5960
{
6061
}

‎dotnet/src/webdriver/ElementClickInterceptedException.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
// </copyright>
1919

2020
using System;
21-
using System.Runtime.Serialization;
21+
22+
#nullable enable
2223

2324
namespace OpenQA.Selenium
2425
{
@@ -41,7 +42,7 @@ public ElementClickInterceptedException()
4142
/// a specified error message.
4243
/// </summary>
4344
/// <param name="message">The message that describes the error.</param>
44-
public ElementClickInterceptedException(string message)
45+
public ElementClickInterceptedException(string? message)
4546
: base(message)
4647
{
4748
}
@@ -54,7 +55,7 @@ public ElementClickInterceptedException(string message)
5455
/// <param name="message">The error message that explains the reason for the exception.</param>
5556
/// <param name="innerException">The exception that is the cause of the current exception,
5657
/// or <see langword="null"/> if no inner exception is specified.</param>
57-
public ElementClickInterceptedException(string message, Exception innerException)
58+
public ElementClickInterceptedException(string? message, Exception? innerException)
5859
: base(message, innerException)
5960
{
6061
}

‎dotnet/src/webdriver/ElementNotInteractableException.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@
1818
// </copyright>
1919

2020
using System;
21-
using System.Runtime.Serialization;
21+
22+
#nullable enable
2223

2324
namespace OpenQA.Selenium
2425
{
2526
/// <summary>
26-
/// The exception that is thrown when an element is not visible.
27+
/// The exception that is thrown when an element is not interactable.
2728
/// </summary>
2829
[Serializable]
2930
public class ElementNotInteractableException : InvalidElementStateException
@@ -41,7 +42,7 @@ public ElementNotInteractableException()
4142
/// a specified error message.
4243
/// </summary>
4344
/// <param name="message">The message that describes the error.</param>
44-
public ElementNotInteractableException(string message)
45+
public ElementNotInteractableException(string? message)
4546
: base(message)
4647
{
4748
}
@@ -54,7 +55,7 @@ public ElementNotInteractableException(string message)
5455
/// <param name="message">The error message that explains the reason for the exception.</param>
5556
/// <param name="innerException">The exception that is the cause of the current exception,
5657
/// or <see langword="null"/> if no inner exception is specified.</param>
57-
public ElementNotInteractableException(string message, Exception innerException)
58+
public ElementNotInteractableException(string? message, Exception? innerException)
5859
: base(message, innerException)
5960
{
6061
}

‎dotnet/src/webdriver/ElementNotSelectableException.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@
1818
// </copyright>
1919

2020
using System;
21-
using System.Runtime.Serialization;
21+
22+
#nullable enable
2223

2324
namespace OpenQA.Selenium
2425
{
2526
/// <summary>
26-
/// The exception that is thrown when an element is not visible.
27+
/// The exception that is thrown when an element is not selectable.
2728
/// </summary>
2829
[Serializable]
2930
public class ElementNotSelectableException : InvalidElementStateException
@@ -41,7 +42,7 @@ public ElementNotSelectableException()
4142
/// a specified error message.
4243
/// </summary>
4344
/// <param name="message">The message that describes the error.</param>
44-
public ElementNotSelectableException(string message)
45+
public ElementNotSelectableException(string? message)
4546
: base(message)
4647
{
4748
}
@@ -54,7 +55,7 @@ public ElementNotSelectableException(string message)
5455
/// <param name="message">The error message that explains the reason for the exception.</param>
5556
/// <param name="innerException">The exception that is the cause of the current exception,
5657
/// or <see langword="null"/> if no inner exception is specified.</param>
57-
public ElementNotSelectableException(string message, Exception innerException)
58+
public ElementNotSelectableException(string? message, Exception? innerException)
5859
: base(message, innerException)
5960
{
6061
}

0 commit comments

Comments
 (0)