Skip to content

Commit 44f8aa7

Browse files
committed
Fix merge issues
1 parent 881a925 commit 44f8aa7

File tree

7 files changed

+3
-8
lines changed

7 files changed

+3
-8
lines changed

dotnet/src/webdriver/BiDi/Browser/GetClientWindowsCommand.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
using OpenQA.Selenium.BiDi.Communication;
2121
using System.Collections.Generic;
22-
using System.Text.Json.Serialization;
2322

2423
namespace OpenQA.Selenium.BiDi.Browser;
2524

dotnet/src/webdriver/BiDi/Browser/GetUserContextsCommand.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
using OpenQA.Selenium.BiDi.Communication;
2121
using System.Collections.Generic;
22-
using System.Text.Json.Serialization;
2322

2423
namespace OpenQA.Selenium.BiDi.Browser;
2524

dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextScriptModule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public async Task<GetRealmsResult> GetRealmsAsync(GetRealmsOptions? options = nu
4040

4141
options.Context = context;
4242

43-
return (await scriptModule.GetRealmsAsync(options).ConfigureAwait(false)).Realms;
43+
return await scriptModule.GetRealmsAsync(options).ConfigureAwait(false);
4444
}
4545

4646
public Task<EvaluateResult> EvaluateAsync(string expression, bool awaitPromise, EvaluateOptions? options = null, ContextTargetOptions? targetOptions = null)

dotnet/src/webdriver/BiDi/BrowsingContext/GetTreeCommand.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
// </copyright>
1919

2020
using OpenQA.Selenium.BiDi.Communication;
21-
using System.Collections;
2221
using System.Collections.Generic;
2322

2423
namespace OpenQA.Selenium.BiDi.BrowsingContext;

dotnet/src/webdriver/BiDi/BrowsingContext/LocateNodesCommand.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
using OpenQA.Selenium.BiDi.Communication;
2121
using System.Collections.Generic;
22-
using System.Text.Json.Serialization;
2322

2423
namespace OpenQA.Selenium.BiDi.BrowsingContext;
2524

dotnet/src/webdriver/BiDi/Script/GetRealmsCommand.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
using OpenQA.Selenium.BiDi.Communication;
2121
using System.Collections.Generic;
22-
using System.Text.Json.Serialization;
2322

2423
namespace OpenQA.Selenium.BiDi.Script;
2524

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public async Task CanGetRealmInBrowsingContext()
6666

6767
var realms = await tab.Context.Script.GetRealmsAsync();
6868

69-
var tabRealm = realms[0] as WindowRealmInfo;
69+
var tabRealm = realms.Realms[0] as WindowRealmInfo;
7070

7171
Assert.That(tabRealm, Is.Not.Null);
7272
Assert.That(tabRealm.Context, Is.EqualTo(tab.Context));
@@ -79,7 +79,7 @@ public async Task CanGetRealmInBrowsingContextByType()
7979

8080
var realms = await tab.Context.Script.GetRealmsAsync(new() { Type = RealmType.Window });
8181

82-
var tabRealm = realms[0] as WindowRealmInfo;
82+
var tabRealm = realms.Realms[0] as WindowRealmInfo;
8383

8484
Assert.That(tabRealm, Is.Not.Null);
8585
Assert.That(tabRealm.Context, Is.EqualTo(tab.Context));

0 commit comments

Comments
 (0)