Skip to content

Commit d1e36ea

Browse files
authored
Merge branch 'trunk' into release-preparation-4.29.0
2 parents 4c10009 + f02c68a commit d1e36ea

File tree

4 files changed

+5
-15
lines changed

4 files changed

+5
-15
lines changed

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ bazel_dep(name = "platforms", version = "0.0.11")
1515
bazel_dep(name = "protobuf", version = "29.2", dev_dependency = True, repo_name = "com_google_protobuf")
1616

1717
# Required for rules_rust to import the crates properly
18-
bazel_dep(name = "rules_cc", version = "0.1.0", dev_dependency = True)
18+
bazel_dep(name = "rules_cc", version = "0.1.1", dev_dependency = True)
1919

2020
bazel_dep(name = "rules_dotnet", version = "0.17.5")
2121
bazel_dep(name = "rules_java", version = "8.7.1")

dotnet/src/webdriver/BiDi/WebDriver.Extensions.cs

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

20-
using OpenQA.Selenium.BiDi.Modules.BrowsingContext;
2120
using System;
2221
using System.Threading.Tasks;
2322

@@ -44,13 +43,4 @@ public static async Task<BiDi> AsBiDiAsync(this IWebDriver webDriver)
4443

4544
return bidi;
4645
}
47-
48-
public static async Task<BrowsingContext> AsBiDiContextAsync(this IWebDriver webDriver)
49-
{
50-
var bidi = await webDriver.AsBiDiAsync();
51-
52-
var currentBrowsingContext = new BrowsingContext(bidi, webDriver.CurrentWindowHandle);
53-
54-
return currentBrowsingContext;
55-
}
5646
}

dotnet/test/common/BiDi/BiDiFixture.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@ public async Task BiDiSetUp()
4444

4545
driver = EnvironmentManager.Instance.CreateDriverInstance(options);
4646

47-
context = await driver.AsBiDiContextAsync();
48-
bidi = context.BiDi;
47+
bidi = await driver.AsBiDiAsync();
48+
49+
context = (await bidi.BrowsingContext.GetTreeAsync())[0].Context;
4950
}
5051

5152
[TearDown]

java/src/org/openqa/selenium/remote/RemoteWebDriverBuilder.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,6 @@ WebDriver getLocalDriver() {
306306

307307
Set<WebDriverInfo> infos =
308308
StreamSupport.stream(ServiceLoader.load(WebDriverInfo.class).spliterator(), false)
309-
.filter(WebDriverInfo::isAvailable)
310309
.collect(Collectors.toSet());
311310

312311
Capabilities additional = new ImmutableCapabilities(additionalCapabilities);
@@ -316,8 +315,8 @@ WebDriver getLocalDriver() {
316315
.flatMap(
317316
caps ->
318317
infos.stream()
319-
.filter(WebDriverInfo::isAvailable)
320318
.filter(info -> info.isSupporting(caps))
319+
.filter(WebDriverInfo::isAvailable)
321320
.map(
322321
info ->
323322
(Supplier<WebDriver>)

0 commit comments

Comments
 (0)