@@ -14,7 +14,7 @@ public class HeadfulTests : PuppeteerBaseTest
1414 {
1515 private readonly LaunchOptions _forcedOopifOptions ;
1616
17- public HeadfulTests ( ) : base ( )
17+ public HeadfulTests ( )
1818 {
1919 _forcedOopifOptions = TestConstants . DefaultBrowserOptions ( ) ;
2020 _forcedOopifOptions . Headless = false ;
@@ -29,9 +29,9 @@ public HeadfulTests(): base()
2929 [ Skip ( SkipAttribute . Targets . Firefox ) ]
3030 public async Task BackgroundPageTargetTypeShouldBeAvailable ( )
3131 {
32- await using ( var browserWithExtension = await Puppeteer . LaunchAsync (
32+ await using var browserWithExtension = await Puppeteer . LaunchAsync (
3333 TestConstants . BrowserWithExtensionOptions ( ) ,
34- TestConstants . LoggerFactory ) )
34+ TestConstants . LoggerFactory ) ;
3535 await using ( await browserWithExtension . NewPageAsync ( ) )
3636 {
3737 var backgroundPageTarget = await browserWithExtension . WaitForTargetAsync ( t => t . Type == TargetType . BackgroundPage ) ;
@@ -43,59 +43,51 @@ public async Task BackgroundPageTargetTypeShouldBeAvailable()
4343 [ Ignore ( "Marked as Fail/Pass upstream" ) ]
4444 public async Task TargetPageShouldReturnABackgroundPage ( )
4545 {
46- await using ( var browserWithExtension = await Puppeteer . LaunchAsync (
46+ await using var browserWithExtension = await Puppeteer . LaunchAsync (
4747 TestConstants . BrowserWithExtensionOptions ( ) ,
48- TestConstants . LoggerFactory ) )
49- {
50- var backgroundPageTarget = await browserWithExtension . WaitForTargetAsync ( t => t . Type == TargetType . BackgroundPage ) ;
51- await using ( var page = await backgroundPageTarget . PageAsync ( ) )
52- {
53- Assert . AreEqual ( 6 , await page . EvaluateFunctionAsync < int > ( "() => 2 * 3" ) ) ;
54- Assert . AreEqual ( 42 , await page . EvaluateFunctionAsync < int > ( "() => window.MAGIC" ) ) ;
55- }
56- }
48+ TestConstants . LoggerFactory ) ;
49+ var backgroundPageTarget = await browserWithExtension . WaitForTargetAsync ( t => t . Type == TargetType . BackgroundPage ) ;
50+ await using var page = await backgroundPageTarget . PageAsync ( ) ;
51+ Assert . AreEqual ( 6 , await page . EvaluateFunctionAsync < int > ( "() => 2 * 3" ) ) ;
52+ Assert . AreEqual ( 42 , await page . EvaluateFunctionAsync < int > ( "() => window.MAGIC" ) ) ;
5753 }
5854
5955 [ PuppeteerTest ( "headful.spec.ts" , "HEADFUL" , "should have default url when launching browser" ) ]
6056 [ Skip ( SkipAttribute . Targets . Firefox ) ]
6157 public async Task ShouldHaveDefaultUrlWhenLaunchingBrowser ( )
6258 {
63- await using ( var browser = await Puppeteer . LaunchAsync (
59+ await using var browser = await Puppeteer . LaunchAsync (
6460 TestConstants . BrowserWithExtensionOptions ( ) ,
65- TestConstants . LoggerFactory ) )
66- {
67- var pages = ( await browser . PagesAsync ( ) ) . Select ( page => page . Url ) . ToArray ( ) ;
68- Assert . AreEqual ( new [ ] { "about:blank" } , pages ) ;
69- }
61+ TestConstants . LoggerFactory ) ;
62+ var pages = ( await browser . PagesAsync ( ) ) . Select ( page => page . Url ) . ToArray ( ) ;
63+ Assert . AreEqual ( new [ ] { "about:blank" } , pages ) ;
7064 }
7165
7266 [ PuppeteerTest ( "headful.spec.ts" , "HEADFUL" , "headless should be able to read cookies written by headful" ) ]
7367 [ Ignore ( "Puppeteer ignores this in windows we do not have a platform filter yet" ) ]
7468 public async Task HeadlessShouldBeAbleToReadCookiesWrittenByHeadful ( )
7569 {
76- using ( var userDataDir = new TempDirectory ( ) )
70+ using var userDataDir = new TempDirectory ( ) ;
71+ var launcher = new Launcher ( TestConstants . LoggerFactory ) ;
72+ var options = TestConstants . DefaultBrowserOptions ( ) ;
73+ options . Args = options . Args . Concat ( new [ ] { $ "--user-data-dir=\" { userDataDir } \" " } ) . ToArray ( ) ;
74+ options . Headless = false ;
75+ await using ( var browser = await launcher . LaunchAsync ( options ) )
76+ await using ( var page = await browser . NewPageAsync ( ) )
7777 {
78- var launcher = new Launcher ( TestConstants . LoggerFactory ) ;
79- var options = TestConstants . DefaultBrowserOptions ( ) ;
80- options . Args = options . Args . Concat ( new [ ] { $ "--user-data-dir=\" { userDataDir } \" " } ) . ToArray ( ) ;
81- options . Headless = false ;
82- await using ( var browser = await launcher . LaunchAsync ( options ) )
83- await using ( var page = await browser . NewPageAsync ( ) )
84- {
85- await page . GoToAsync ( TestConstants . EmptyPage ) ;
86- await page . EvaluateExpressionAsync (
87- "document.cookie = 'foo=true; expires=Fri, 31 Dec 9999 23:59:59 GMT'" ) ;
88- }
78+ await page . GoToAsync ( TestConstants . EmptyPage ) ;
79+ await page . EvaluateExpressionAsync (
80+ "document.cookie = 'foo=true; expires=Fri, 31 Dec 9999 23:59:59 GMT'" ) ;
81+ }
8982
90- await TestUtils . WaitForCookieInChromiumFileAsync ( userDataDir . Path , "foo" ) ;
83+ await TestUtils . WaitForCookieInChromiumFileAsync ( userDataDir . Path , "foo" ) ;
9184
92- options . Headless = true ;
93- await using ( var browser2 = await Puppeteer . LaunchAsync ( options , TestConstants . LoggerFactory ) )
94- {
95- var page2 = await browser2 . NewPageAsync ( ) ;
96- await page2 . GoToAsync ( TestConstants . EmptyPage ) ;
97- Assert . AreEqual ( "foo=true" , await page2 . EvaluateExpressionAsync < string > ( "document.cookie" ) ) ;
98- }
85+ options . Headless = true ;
86+ await using ( var browser2 = await Puppeteer . LaunchAsync ( options , TestConstants . LoggerFactory ) )
87+ {
88+ var page2 = await browser2 . NewPageAsync ( ) ;
89+ await page2 . GoToAsync ( TestConstants . EmptyPage ) ;
90+ Assert . AreEqual ( "foo=true" , await page2 . EvaluateExpressionAsync < string > ( "document.cookie" ) ) ;
9991 }
10092 }
10193
@@ -106,24 +98,22 @@ public async Task OOPIFShouldReportGoogleComFrame()
10698 // https://google.com is isolated by default in Chromium embedder.
10799 var headfulOptions = TestConstants . DefaultBrowserOptions ( ) ;
108100 headfulOptions . Headless = false ;
109- await using ( var browser = await Puppeteer . LaunchAsync ( headfulOptions ) )
110- await using ( var page = await browser . NewPageAsync ( ) )
111- {
112- await page . GoToAsync ( TestConstants . EmptyPage ) ;
113- await page . SetRequestInterceptionAsync ( true ) ;
114- page . Request += async ( _ , e ) => await e . Request . RespondAsync (
115- new ResponseData { Body = "{ body: 'YO, GOOGLE.COM'}" } ) ;
116- await page . EvaluateFunctionHandleAsync ( @"() => {
101+ await using var browser = await Puppeteer . LaunchAsync ( headfulOptions ) ;
102+ await using var page = await browser . NewPageAsync ( ) ;
103+ await page . GoToAsync ( TestConstants . EmptyPage ) ;
104+ await page . SetRequestInterceptionAsync ( true ) ;
105+ page . Request += async ( _ , e ) => await e . Request . RespondAsync (
106+ new ResponseData { Body = "{ body: 'YO, GOOGLE.COM'}" } ) ;
107+ await page . EvaluateFunctionHandleAsync ( @"() => {
117108 const frame = document.createElement('iframe');
118109 frame.setAttribute('src', 'https://google.com/');
119110 document.body.appendChild(frame);
120111 return new Promise(x => frame.onload = x);
121112 }" ) ;
122- await page . WaitForSelectorAsync ( "iframe[src=\" https://google.com/\" ]" ) ;
123- var urls = Array . ConvertAll ( page . Frames , frame => frame . Url ) ;
124- Array . Sort ( urls ) ;
125- Assert . AreEqual ( new [ ] { TestConstants . EmptyPage , "https://google.com/" } , urls ) ;
126- }
113+ await page . WaitForSelectorAsync ( "iframe[src=\" https://google.com/\" ]" ) ;
114+ var urls = Array . ConvertAll ( page . Frames , frame => frame . Url ) ;
115+ Array . Sort ( ( Array ) urls ) ;
116+ Assert . AreEqual ( new [ ] { TestConstants . EmptyPage , "https://google.com/" } , urls ) ;
127117 }
128118
129119 [ PuppeteerTest ( "headful.spec.ts" , "HEADFUL" , "OOPIF: should expose events within OOPIFs" ) ]
0 commit comments