@@ -20,7 +20,7 @@ public ExposeFunctionTests(ITestOutputHelper output) : base(output)
2020 public async Task ShouldWork ( )
2121 {
2222 await Page . ExposeFunctionAsync ( "compute" , ( int a , int b ) => a * b ) ;
23- var result = await Page . EvaluateExpressionAsync < int > ( "compute(9, 4)" ) ;
23+ var result = await Page . EvaluateFunctionAsync < int > ( "async () => compute(9, 4)" ) ;
2424 Assert . Equal ( 36 , result ) ;
2525 }
2626
@@ -49,7 +49,7 @@ public async Task ShouldBeCallableFromInsideEvaluateOnNewDocument()
4949 {
5050 var called = false ;
5151 await Page . ExposeFunctionAsync ( "woof" , ( ) => called = true ) ;
52- await Page . EvaluateFunctionOnNewDocumentAsync ( "() => woof()" ) ;
52+ await Page . EvaluateFunctionOnNewDocumentAsync ( "async () => woof()" ) ;
5353 await Page . ReloadAsync ( ) ;
5454 Assert . True ( called ) ;
5555 }
@@ -60,7 +60,7 @@ public async Task ShouldSurviveNavigation()
6060 {
6161 await Page . ExposeFunctionAsync ( "compute" , ( int a , int b ) => a * b ) ;
6262 await Page . GoToAsync ( TestConstants . EmptyPage ) ;
63- var result = await Page . EvaluateExpressionAsync < int > ( "compute(9, 4)" ) ;
63+ var result = await Page . EvaluateFunctionAsync < int > ( "async () => compute(9, 4)" ) ;
6464 Assert . Equal ( 36 , result ) ;
6565 }
6666
@@ -69,7 +69,7 @@ public async Task ShouldSurviveNavigation()
6969 public async Task ShouldAwaitReturnedValueTask ( )
7070 {
7171 await Page . ExposeFunctionAsync ( "compute" , ( int a , int b ) => Task . FromResult ( a * b ) ) ;
72- var result = await Page . EvaluateExpressionAsync < int > ( "compute(3, 5)" ) ;
72+ var result = await Page . EvaluateFunctionAsync < int > ( "async () => compute(3, 5)" ) ;
7373 Assert . Equal ( 15 , result ) ;
7474 }
7575
@@ -80,7 +80,7 @@ public async Task ShouldWorkOnFrames()
8080 await Page . ExposeFunctionAsync ( "compute" , ( int a , int b ) => Task . FromResult ( a * b ) ) ;
8181 await Page . GoToAsync ( TestConstants . ServerUrl + "/frames/nested-frames.html" ) ;
8282 var frame = Page . FirstChildFrame ( ) ;
83- var result = await frame . EvaluateExpressionAsync < int > ( "compute(3, 5)" ) ;
83+ var result = await frame . EvaluateFunctionAsync < int > ( "async () => compute(3, 5)" ) ;
8484 Assert . Equal ( 15 , result ) ;
8585 }
8686
@@ -92,7 +92,7 @@ public async Task ShouldWorkOnFramesBeforeNavigation()
9292 await Page . ExposeFunctionAsync ( "compute" , ( int a , int b ) => Task . FromResult ( a * b ) ) ;
9393
9494 var frame = Page . FirstChildFrame ( ) ;
95- var result = await frame . EvaluateExpressionAsync < int > ( "compute(3, 5)" ) ;
95+ var result = await frame . EvaluateFunctionAsync < int > ( "async () => compute(3, 5)" ) ;
9696 Assert . Equal ( 15 , result ) ;
9797 }
9898
@@ -103,7 +103,7 @@ public async Task ShouldWorkWithComplexObjects()
103103 await Page . GoToAsync ( TestConstants . ServerUrl + "/frames/nested-frames.html" ) ;
104104 await Page . ExposeFunctionAsync ( "complexObject" , ( dynamic a , dynamic b ) => Task . FromResult ( new { X = a . x + b . x } ) ) ;
105105
106- var result = await Page . EvaluateExpressionAsync < JToken > ( "complexObject({x: 5}, {x: 2})" ) ;
106+ var result = await Page . EvaluateFunctionAsync < JToken > ( "async () => complexObject({x: 5}, {x: 2})" ) ;
107107 Assert . Equal ( 7 , result . SelectToken ( "x" ) . ToObject < int > ( ) ) ;
108108 }
109109
@@ -116,7 +116,7 @@ await Page.ExposeFunctionAsync("changeFlag", () =>
116116 called = true ;
117117 return Task . CompletedTask ;
118118 } ) ;
119- await Page . EvaluateExpressionAsync ( " changeFlag()") ;
119+ await Page . EvaluateFunctionAsync ( "async () => changeFlag()") ;
120120 Assert . True ( called ) ;
121121 }
122122
@@ -128,15 +128,15 @@ await Page.ExposeFunctionAsync("changeFlag", () =>
128128 {
129129 called = true ;
130130 } ) ;
131- await Page . EvaluateExpressionAsync ( " changeFlag()") ;
131+ await Page . EvaluateFunctionAsync ( "async () => changeFlag()") ;
132132 Assert . True ( called ) ;
133133 }
134134
135135 [ SkipBrowserFact ( skipFirefox : true ) ]
136136 public async Task ShouldKeepTheCallbackClean ( )
137137 {
138138 await Page . ExposeFunctionAsync ( "compute" , ( int a , int b ) => a * b ) ;
139- await Page . EvaluateExpressionAsync < int > ( "compute(9, 4)" ) ;
139+ await Page . EvaluateFunctionAsync < int > ( "async () => await compute(9, 4)" ) ;
140140
141141 // For CI/CD debugging purposes
142142 var session = ( CDPSession ) Page . Client ;
0 commit comments