Skip to content

Commit 59497f5

Browse files
committed
CallFunction returns EvaluateResult
1 parent b2b98e0 commit 59497f5

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public Task<EvaluateResult> EvaluateAsync(string expression, bool awaitPromise,
6363
return result.AsSuccessResult().ConvertTo<TResult>();
6464
}
6565

66-
public Task<CallFunctionResult> CallFunctionAsync(string functionDeclaration, bool awaitPromise, CallFunctionOptions? options = null, ContextTargetOptions? targetOptions = null)
66+
public Task<EvaluateResult> CallFunctionAsync(string functionDeclaration, bool awaitPromise, CallFunctionOptions? options = null, ContextTargetOptions? targetOptions = null)
6767
{
6868
var contextTarget = new ContextTarget(context);
6969

dotnet/src/webdriver/BiDi/Communication/Json/BiDiJsonSerializerContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ namespace OpenQA.Selenium.BiDi.Communication.Json;
168168
[JsonSerializable(typeof(Script.DisownCommand))]
169169
[JsonSerializable(typeof(Script.DisownResult))]
170170
[JsonSerializable(typeof(Script.CallFunctionCommand))]
171-
[JsonSerializable(typeof(Script.CallFunctionResult))]
171+
[JsonSerializable(typeof(Script.EvaluateResult))]
172172
[JsonSerializable(typeof(Script.EvaluateCommand))]
173173
[JsonSerializable(typeof(Script.EvaluateResult))]
174174
[JsonSerializable(typeof(Script.GetRealmsCommand))]

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
namespace OpenQA.Selenium.BiDi.Script;
2424

2525
internal sealed class CallFunctionCommand(CallFunctionParameters @params)
26-
: Command<CallFunctionParameters, CallFunctionResult>(@params, "script.callFunction");
26+
: Command<CallFunctionParameters, EvaluateResult>(@params, "script.callFunction");
2727

2828
internal sealed record CallFunctionParameters(string FunctionDeclaration, bool AwaitPromise, Target Target, IEnumerable<LocalValue>? Arguments, ResultOwnership? ResultOwnership, SerializationOptions? SerializationOptions, LocalValue? This, bool? UserActivation) : Parameters;
2929

@@ -39,5 +39,3 @@ public sealed class CallFunctionOptions : CommandOptions
3939

4040
public bool? UserActivation { get; set; }
4141
}
42-
43-
public sealed record CallFunctionResult : EvaluateResult;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ public async Task<EvaluateResult> EvaluateAsync(string expression, bool awaitPro
4040
return result.AsSuccessResult().ConvertTo<TResult>();
4141
}
4242

43-
public async Task<CallFunctionResult> CallFunctionAsync(string functionDeclaration, bool awaitPromise, Target target, CallFunctionOptions? options = null)
43+
public async Task<EvaluateResult> CallFunctionAsync(string functionDeclaration, bool awaitPromise, Target target, CallFunctionOptions? options = null)
4444
{
4545
var @params = new CallFunctionParameters(functionDeclaration, awaitPromise, target, options?.Arguments, options?.ResultOwnership, options?.SerializationOptions, options?.This, options?.UserActivation);
4646

47-
return await Broker.ExecuteCommandAsync(new CallFunctionCommand(@params), options, JsonContext.CallFunctionCommand, JsonContext.CallFunctionResult).ConfigureAwait(false);
47+
return await Broker.ExecuteCommandAsync(new CallFunctionCommand(@params), options, JsonContext.CallFunctionCommand, JsonContext.EvaluateResult).ConfigureAwait(false);
4848
}
4949

5050
public async Task<TResult?> CallFunctionAsync<TResult>(string functionDeclaration, bool awaitPromise, Target target, CallFunctionOptions? options = null)

0 commit comments

Comments
 (0)