Skip to content

Add async to EvaluateScriptAsPromiseAsync and tests #3314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 11, 2020
Merged

Add async to EvaluateScriptAsPromiseAsync and tests #3314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc9ebe1
Add async to EvaluateScriptAsPromiseAsync and tests
pgodwin Dec 11, 2020
deff308
Merge branch 'master' into master
pgodwin Dec 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CefSharp.Test/OffScreen/OffScreenBrowserBasicFacts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,9 @@ public async Task CanEvaluateScriptAsPromiseAsyncJavascriptBindingApiGlobalObjec
[InlineData("return 42;", true, "42")]
[InlineData("return new Promise(function(resolve, reject) { resolve(42); });", true, "42")]
[InlineData("return new Promise(function(resolve, reject) { reject('reject test'); });", false, "reject test")]
[InlineData("return await 42;", true, "42")]
[InlineData("return await (function() { throw('reject test'); })();", false, "reject test")]
[InlineData("var result = await fetch('./robots.txt'); return result.status;", true, "200")]
public async Task CanEvaluateScriptAsPromiseAsync(string script, bool success, string expected)
{
using (var browser = new ChromiumWebBrowser("http://www.google.com"))
Expand Down Expand Up @@ -255,6 +258,8 @@ public async Task CanEvaluateScriptAsPromiseAsync(string script, bool success, s
[InlineData("return { a: 'CefSharp', b: 42, };", true, "CefSharp", "42")]
[InlineData("return new Promise(function(resolve, reject) { resolve({ a: 'CefSharp', b: 42, }); });", true, "CefSharp", "42")]
[InlineData("return new Promise(function(resolve, reject) { setTimeout(resolve.bind(null, { a: 'CefSharp', b: 42, }), 1000); });", true, "CefSharp", "42")]
[InlineData("return await { a: 'CefSharp', b: 42, };", true, "CefSharp", "42")]
[InlineData("return await new Promise(function(resolve, reject) { setTimeout(resolve.bind(null, { a: 'CefSharp', b: 42, }), 1000); }); ", true, "CefSharp", "42")]
public async Task CanEvaluateScriptAsPromiseAsyncReturnObject(string script, bool success, string expectedA, string expectedB)
{
using (var browser = new ChromiumWebBrowser("http://www.google.com"))
Expand Down
2 changes: 1 addition & 1 deletion CefSharp/WebBrowserExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1046,7 +1046,7 @@ private static string GetPromiseHandlerScript(string script, string javascriptBi
internalJsFunctionName += ".SendEvalScriptResponse";
}
}
var promiseHandlerScript = "let innerImmediatelyInvokedFuncExpression = (function() { " + script + " })(); Promise.resolve(innerImmediatelyInvokedFuncExpression).then((val) => " + internalJsFunctionName + "(cefSharpInternalCallbackId, true, val)).catch ((reason) => " + internalJsFunctionName + "(cefSharpInternalCallbackId, false, String(reason))); return 'CefSharpDefEvalScriptRes';";
var promiseHandlerScript = "let innerImmediatelyInvokedFuncExpression = (async function() { " + script + " })(); Promise.resolve(innerImmediatelyInvokedFuncExpression).then((val) => " + internalJsFunctionName + "(cefSharpInternalCallbackId, true, val)).catch ((reason) => " + internalJsFunctionName + "(cefSharpInternalCallbackId, false, String(reason))); return 'CefSharpDefEvalScriptRes';";

return promiseHandlerScript;
}
Expand Down