Fix some tests in Firefox (#2237)

* Fix some tests in Firefox

* Fix one more test

* a few more

* More fixes

* Fix another test

* Another fix

* Fix closed test

Author: kblok

lib/PuppeteerSharp.Tests/EvaluationTests/PageEvaluateTests.cs

@@ -238,7 +238,7 @@ public async Task ShouldFailForCircularObject()
         public async Task ShouldBeAbleToThrowATrickyError()
         {
             var windowHandle = await Page.EvaluateFunctionHandleAsync("() => window");
-            PuppeteerException exception = await Assert.ThrowsAsync<MessageException>(() => windowHandle.JsonValueAsync());
+            PuppeteerException exception = await Assert.ThrowsAsync<PuppeteerException>(() => windowHandle.JsonValueAsync());
             var errorText = exception.Message;
 
             exception = await Assert.ThrowsAsync<EvaluationFailedException>(() => Page.EvaluateFunctionAsync(@"errorText =>

lib/PuppeteerSharp.Tests/JSHandleTests/JsonValueTests.cs

@@ -55,10 +55,10 @@ public async Task ShouldNotWorkWithDates()
         public async Task ShouldThrowForCircularObjects()
         {
             var windowHandle = await Page.EvaluateExpressionHandleAsync("window");
-            var exception = await Assert.ThrowsAsync<MessageException>(()
+            var exception = await Assert.ThrowsAsync<PuppeteerException>(()
                 => windowHandle.JsonValueAsync());
 
-            Assert.Contains(TestConstants.IsChrome ? "Object reference chain is too long" : "Object is not serializable", exception.Message);
+            Assert.Contains("Could not serialize referenced object", exception.Message);
         }
     }
 }

lib/PuppeteerSharp.Tests/LauncherTests/BrowserDisconnectTests.cs

@@ -33,7 +33,13 @@ public async Task ShouldRejectNavigationWhenBrowserCloses()
                 await Server.WaitForRequest("/one-style.css");
                 remote.Disconnect();
                 var exception = await Assert.ThrowsAsync<NavigationException>(() => navigationTask);
-                Assert.Contains("Navigation failed because browser has disconnected!", exception.Message);
+                Assert.Contains(
+                    new[]
+                    {
+                        "Navigation failed because browser has disconnected! (Connection disposed)",
+                        "Protocol error(Page.navigate): Target closed. (Connection disposed)",
+                    },
+                    value => value == exception.Message);
             }
         }
 

lib/PuppeteerSharp.Tests/LauncherTests/PuppeteerLaunchTests.cs

@@ -23,11 +23,12 @@ public PuppeteerLaunchTests(ITestOutputHelper output) : base(output) { }
         public async Task ShouldWorkInRealLife()
         {
             var options = TestConstants.DefaultBrowserOptions();
+            options.IgnoreHTTPSErrors = true;
 
             await using (var browser = await Puppeteer.LaunchAsync(options, TestConstants.LoggerFactory))
             await using (var page = await browser.NewPageAsync())
             {
-                var response = await page.GoToAsync("https://www.google.com");
+                var response = await page.GoToAsync("https://www.github.com");
                 Assert.Equal(HttpStatusCode.OK, response.Status);
             }
         }

lib/PuppeteerSharp.Tests/PageTests/CloseTests.cs

@@ -100,9 +100,10 @@ public async Task ShouldNotRunBeforeunloadByDefault()
         [PuppeteerFact]
         public async Task ShouldSetThePageCloseState()
         {
-            Assert.False(Page.IsClosed);
-            await Page.CloseAsync();
-            Assert.True(Page.IsClosed);
+            var page = await Context.NewPageAsync();
+            Assert.False(page.IsClosed);
+            await page.CloseAsync();
+            Assert.True(page.IsClosed);
         }
 
         [PuppeteerTest("page.spec.ts", "Page.close", "should terminate network waiters")]

lib/PuppeteerSharp.Tests/WaitTaskTests/FrameWaitForSelectorTests.cs

@@ -169,38 +169,38 @@ public async Task ShouldWaitForVisibleBoundingBox()
             await Page.SetContentAsync("<div style='width: 0;'>text</div>");
             await Task.Delay(100);
             Assert.False(divFound);
-            await Page.EvaluateExpressionAsync(@"() => {
+            await Page.EvaluateFunctionAsync(@"() => {
                 const div = document.querySelector('div');
                 div.style.setProperty('height', '0');
                 div.style.removeProperty('width');
             }");
             await Task.Delay(100);
             Assert.False(divFound);
-            await Page.EvaluateExpressionAsync(@"() => {
+            await Page.EvaluateFunctionAsync(@"() => {
                 const div = document.querySelector('div');
                 div.style.setProperty('position', 'absolute');
                 div.style.setProperty('right', '100vw');
                 div.style.removeProperty('height');
             }");
             await Task.Delay(100);
             Assert.False(divFound);
-            await Page.EvaluateExpressionAsync(@"() => {
+            await Page.EvaluateFunctionAsync(@"() => {
                 const div = document.querySelector('div');
                 div.style.setProperty('position', 'absolute');
                 div.style.setProperty('left', '100vw');
                 div.style.removeProperty('right');
             }");
             await Task.Delay(100);
             Assert.False(divFound);
-            await Page.EvaluateExpressionAsync(@"() => {
+            await Page.EvaluateFunctionAsync(@"() => {
                 const div = document.querySelector('div');
                 div.style.setProperty('position', 'absolute');
                 div.style.setProperty('top', '100vw');
                 div.style.removeProperty('left');
             }");
             await Task.Delay(100);
             Assert.False(divFound);
-            await Page.EvaluateExpressionAsync(@"() => {
+            await Page.EvaluateFunctionAsync(@"() => {
                 const div = document.querySelector('div');
                 div.style.setProperty('position', 'absolute');
                 div.style.setProperty('bottom', '100vw');

lib/PuppeteerSharp/FirefoxTargetManager.cs

@@ -62,6 +62,10 @@ public async Task InitializeAsync()
             await _connection.SendAsync("Target.setDiscoverTargets", new TargetSetDiscoverTargetsRequest
             {
                 Discover = true,
+                Filter = new[]
+                {
+                    new TargetSetDiscoverTargetsRequest.DiscoverFilter(),
+                },
             }).ConfigureAwait(false);
 
             _targetsIdsForInit = new List<string>(_discoveredTargetsByTargetId.Keys);
@@ -125,7 +129,13 @@ private void OnTargetCreated(TargetCreatedResponse e)
 
             var target = _targetFactoryFunc(e.TargetInfo, null);
             _availableTargetsByTargetId[e.TargetInfo.TargetId] = target;
-            TargetAvailable?.Invoke(this, new TargetChangedArgs { TargetInfo = e.TargetInfo });
+            TargetAvailable?.Invoke(
+                this,
+                new TargetChangedArgs
+                {
+                    Target = target,
+                    TargetInfo = e.TargetInfo,
+                });
             FinishInitializationIfReady(target.TargetId);
         }
 

lib/PuppeteerSharp/JSHandle.cs

@@ -91,19 +91,14 @@ public async Task<T> JsonValueAsync<T>()
         {
             var objectId = RemoteObject.ObjectId;
 
-            if (objectId != null)
+            if (objectId == null)
             {
-                var response = await Client.SendAsync<RuntimeCallFunctionOnResponse>("Runtime.callFunctionOn", new RuntimeCallFunctionOnRequest
-                {
-                    FunctionDeclaration = "function() { return this; }",
-                    ObjectId = objectId,
-                    ReturnByValue = true,
-                    AwaitPromise = true,
-                }).ConfigureAwait(false);
-                return (T)RemoteObjectHelper.ValueFromRemoteObject<T>(response.Result);
+                return (T)RemoteObjectHelper.ValueFromRemoteObject<T>(RemoteObject);
             }
 
-            return (T)RemoteObjectHelper.ValueFromRemoteObject<T>(RemoteObject);
+            var value = await EvaluateFunctionAsync<T>("object => object").ConfigureAwait(false);
+
+            return value == null ? throw new PuppeteerException("Could not serialize referenced object") : value;
         }
 
         /// <inheritdoc/>

lib/PuppeteerSharp/LifecycleWatcher.cs

@@ -35,7 +35,6 @@ internal sealed class LifecycleWatcher : IDisposable
         private IRequest _navigationRequest;
         private bool _hasSameDocumentNavigation;
         private bool _swapped;
-        private bool _newDocumentNavigation;
 
         public LifecycleWatcher(
             FrameManager frameManager,
@@ -99,7 +98,6 @@ private void Navigated(object sender, FrameEventArgs e)
                 return;
             }
 
-            _newDocumentNavigation = true;
             CheckLifecycleComplete();
         }
 
@@ -143,7 +141,7 @@ private void CheckLifecycleComplete()
                 _sameDocumentNavigationTaskWrapper.TrySetResult(true);
             }
 
-            if (_swapped || _newDocumentNavigation)
+            if (_swapped || _frame.LoaderId != _initialLoaderId)
             {
                 _newDocumentNavigationTaskWrapper.TrySetResult(true);
             }

lib/PuppeteerSharp/ResourceType.cs

@@ -16,6 +16,11 @@ public enum ResourceType
         /// </summary>
         Unknown = -1,
 
+        /// <summary>
+        /// Beacon.
+        /// </summary>
+        Beacon,
+
         /// <summary>
         /// Document.
         /// </summary>
@@ -32,6 +37,12 @@ public enum ResourceType
         /// </summary>
         Image,
 
+        /// <summary>
+        /// Imageset.
+        /// </summary>
+        [EnumMember(Value = "imageset")]
+        ImageSet,
+
         /// <summary>
         /// Media.
         /// </summary>