Improve the page target

Author: kblok

lib/PuppeteerSharp.Tests/BrowserContextTests/BrowserContextTests.cs

@@ -184,7 +184,7 @@ public async Task ShouldWaitForTarget()
 
         [PuppeteerTest("browsercontext.spec.ts", "BrowserContext", "should timeout waiting for a non-existent target")]
         [PuppeteerTimeout]
-        public async Task ShouldTimeoutWaitingForNonExistantTarget()
+        public async Task ShouldTimeoutWaitingForNonExistentTarget()
         {
             var context = await Browser.CreateIncognitoBrowserContextAsync();
             Assert.ThrowsAsync<TimeoutException>(()

lib/PuppeteerSharp.Tests/DefaultBrowserContextTests/BrowserTargetEventsTests.cs

@@ -21,13 +21,11 @@ public async Task ShouldWork()
         {
             using var browser = await Puppeteer.LaunchAsync(TestConstants.DefaultBrowserOptions());
 
-            var page = await browser.NewPageAsync();
-            await browser.PagesAsync();
             var events = new List<string>();
             browser.TargetCreated += (_, _) => events.Add("CREATED");
             browser.TargetChanged += (_, _) => events.Add("CHANGED");
             browser.TargetDestroyed += (_, _) => events.Add("DESTROYED");
-            page = await browser.NewPageAsync();
+            var page = await browser.NewPageAsync();
             await page.GoToAsync(TestConstants.EmptyPage);
             await page.CloseAsync();
 

lib/PuppeteerSharp.Tests/LauncherTests/DefaultBrowserContextTests.cs

@@ -21,14 +21,11 @@ public async Task ShouldWork()
         {
             using var browser = await Puppeteer.LaunchAsync(TestConstants.DefaultBrowserOptions());
             var events = new List<string>();
-            // This new page is not in upstream but we use to to wait for the browser to be ready
-            // If we don't do this the first event we get is the target of the about:blank page
-            var page = await browser.NewPageAsync();
 
             Browser.TargetCreated += (_, _) => events.Add("CREATED");
             Browser.TargetChanged += (_, _) => events.Add("CHANGED");
             Browser.TargetDestroyed += (_, _) => events.Add("DESTROYED");
-            page = await Browser.NewPageAsync();
+            var page = await Browser.NewPageAsync();
             await page.GoToAsync(TestConstants.EmptyPage);
             await page.CloseAsync();
             Assert.AreEqual(new[] { "CREATED", "CHANGED", "DESTROYED" }, events);

lib/PuppeteerSharp/PageTarget.cs

@@ -68,13 +68,19 @@ protected override void Initialize()
                     openerPage.OnPopup(popupPage);
                 },
                 TaskScheduler.Default);
+            CheckIfInitialized();
         }
 
         protected override void CheckIfInitialized()
         {
-            if (!IsInitialized && (TargetInfo.Type != TargetType.Page || !string.IsNullOrEmpty(TargetInfo.Url)))
+            if (IsInitialized)
+            {
+                return;
+            }
+
+            IsInitialized = !string.IsNullOrEmpty(TargetInfo.Url);
+            if (IsInitialized)
             {
-                IsInitialized = true;
                 InitializedTaskWrapper.TrySetResult(true);
             }
         }