[BREAKING] Split CdpSession (#2571)

* Split CdpSession * Docs changes * Ignore new tests in firefox * doc update * Docs changes --------- Co-authored-by: GitHub Action <action@github.com>
hardkoded · Mar 28, 2024 · dd4e9b9 · dd4e9b9
1 parent 43f13e3
commit dd4e9b9
Show file tree

Hide file tree

Showing 237 changed files with 437 additions and 428 deletions.
diff --git a/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json b/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json
@@ -69,6 +69,13 @@
     "parameters": ["firefox", "headful"],
     "expectations": ["FAIL"]
   },
+  {
+    "comment": "",
+    "testIdPattern": "[puppeteer-sharp] *",
+    "platforms": ["darwin", "linux", "win32"],
+    "parameters": ["firefox"],
+    "expectations": ["FAIL"]
+  },
   {
     "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
     "testIdPattern": "[accessibility.spec] *",

diff --git a/lib/PuppeteerSharp.Tests/CDPSessionTests/CreateCDPSessionTests.cs b/lib/PuppeteerSharp.Tests/CDPSessionTests/CreateCDPSessionTests.cs
@@ -3,7 +3,7 @@
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 using NUnit.Framework;
-using PuppeteerSharp.Messaging;
+using PuppeteerSharp.Cdp.Messaging;
 using PuppeteerSharp.Nunit;
 
 namespace PuppeteerSharp.Tests.CDPSessionTests

diff --git a/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/DeviceRequestPromptCancelTests.cs b/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/DeviceRequestPromptCancelTests.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
-using PuppeteerSharp.Messaging;
+using PuppeteerSharp.Cdp.Messaging;
 using PuppeteerSharp.Nunit;
 
 namespace PuppeteerSharp.Tests.DeviceRequestPromptTests;

diff --git a/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/DeviceRequestPromptDevicesTests.cs b/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/DeviceRequestPromptDevicesTests.cs
@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using PuppeteerSharp.Messaging;
+using PuppeteerSharp.Cdp.Messaging;
 using PuppeteerSharp.Nunit;
 
 namespace PuppeteerSharp.Tests.DeviceRequestPromptTests;

diff --git a/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/DeviceRequestPromptSelectTests.cs b/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/DeviceRequestPromptSelectTests.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 using NUnit.Framework;
-using PuppeteerSharp.Messaging;
+using PuppeteerSharp.Cdp.Messaging;
 using PuppeteerSharp.Nunit;
 
 namespace PuppeteerSharp.Tests.DeviceRequestPromptTests;

diff --git a/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/DeviceRequestPromptWaitForDeviceTests.cs b/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/DeviceRequestPromptWaitForDeviceTests.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
-using PuppeteerSharp.Messaging;
+using PuppeteerSharp.Cdp.Messaging;
 using PuppeteerSharp.Nunit;
 
 namespace PuppeteerSharp.Tests.DeviceRequestPromptTests;

diff --git a/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/MockCDPSession.cs b/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/MockCDPSession.cs
@@ -24,7 +24,7 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json.Linq;
-using PuppeteerSharp.Messaging;
+using PuppeteerSharp.Cdp.Messaging;
 
 namespace PuppeteerSharp.Tests.DeviceRequestPromptTests;
 

diff --git a/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/WaitForDevicePromptTests.cs b/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/WaitForDevicePromptTests.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 using NUnit.Framework;
-using PuppeteerSharp.Messaging;
+using PuppeteerSharp.Cdp.Messaging;
 using PuppeteerSharp.Nunit;
 
 namespace PuppeteerSharp.Tests.DeviceRequestPromptTests

diff --git a/lib/PuppeteerSharp.Tests/ExtensionsTests/ExtensionsTests.cs b/lib/PuppeteerSharp.Tests/ExtensionsTests/ExtensionsTests.cs
@@ -4,7 +4,6 @@
 using System.Threading.Tasks;
 using NUnit.Framework;
 using PuppeteerSharp.Helpers;
-using PuppeteerSharp.Messaging;
 using PuppeteerSharp.Nunit;
 
 namespace PuppeteerSharp.Tests.ExtensionsTests

diff --git a/lib/PuppeteerSharp.Tests/HeadfulTests/HeadfulTests.cs b/lib/PuppeteerSharp.Tests/HeadfulTests/HeadfulTests.cs
@@ -4,7 +4,6 @@
 using System.Threading.Tasks;
 using NUnit.Framework;
 using PuppeteerSharp.Helpers;
-using PuppeteerSharp.Messaging;
 using PuppeteerSharp.Nunit;
 
 namespace PuppeteerSharp.Tests.HeadfulTests

diff --git a/lib/PuppeteerSharp.Tests/NetworkManagerTests/NetworkManagerTests.cs b/lib/PuppeteerSharp.Tests/NetworkManagerTests/NetworkManagerTests.cs
@@ -8,7 +8,7 @@
 using NSubstitute;
 using NUnit.Framework;
 using PuppeteerSharp.Cdp;
-using PuppeteerSharp.Messaging;
+using PuppeteerSharp.Cdp.Messaging;
 using PuppeteerSharp.Nunit;
 
 namespace PuppeteerSharp.Tests.NetworkManagerTests;

diff --git a/lib/PuppeteerSharp.Tests/OOPIFTests/OOPIFTests.cs b/lib/PuppeteerSharp.Tests/OOPIFTests/OOPIFTests.cs
@@ -3,8 +3,8 @@
 using System.Linq;
 using System.Threading.Tasks;
 using NUnit.Framework;
+using PuppeteerSharp.Cdp.Messaging;
 using PuppeteerSharp.Helpers;
-using PuppeteerSharp.Messaging;
 using PuppeteerSharp.Nunit;
 
 namespace PuppeteerSharp.Tests.OOPIFTests

diff --git a/lib/PuppeteerSharp.Tests/PageTests/ExposeFunctionTests.cs b/lib/PuppeteerSharp.Tests/PageTests/ExposeFunctionTests.cs
@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 using NUnit.Framework;
+using PuppeteerSharp.Cdp;
 using PuppeteerSharp.Nunit;
 
 namespace PuppeteerSharp.Tests.PageTests
@@ -124,6 +125,7 @@ public async Task ShouldWorkWithComplexObjects()
             Assert.AreEqual(7, result.SelectToken("x").ToObject<int>());
         }
 
+        [Test, Retry(2), PuppeteerTest("puppeteer-sharp", "ExposeFunctionTests", "should await returned task")]
         public async Task ShouldAwaitReturnedTask()
         {
             var called = false;
@@ -136,6 +138,7 @@ await Page.ExposeFunctionAsync("changeFlag", () =>
             Assert.True(called);
         }
 
+        [Test, Retry(2), PuppeteerTest("puppeteer-sharp", "ExposeFunctionTests", "should work with action")]
         public async Task ShouldWorkWithAction()
         {
             var called = false;
@@ -147,6 +150,7 @@ await Page.ExposeFunctionAsync("changeFlag", () =>
             Assert.True(called);
         }
 
+        [Test, Retry(2), PuppeteerTest("puppeteer-sharp", "ExposeFunctionTests", "should keel the callback clean")]
         public async Task ShouldKeepTheCallbackClean()
         {
             await Page.ExposeFunctionAsync("compute", (int a, int b) => a * b);
@@ -156,7 +160,7 @@ public async Task ShouldKeepTheCallbackClean()
             await Task.Delay(300);
 
             // For CI/CD debugging purposes
-            var session = (CDPSession)Page.Client;
+            var session = (CdpCDPSession)Page.Client;
             var message = "Expected an empty callback list. Found: \n";
 
             if (session.HasPendingCallbacks())
@@ -167,7 +171,7 @@ public async Task ShouldKeepTheCallbackClean()
                 }
             }
 
-            Assert.False(((CDPSession)Page.Client).HasPendingCallbacks(), message);
+            Assert.False(((CdpCDPSession)Page.Client).HasPendingCallbacks(), message);
         }
     }
 }
diff --git a/lib/PuppeteerSharp/Binding.cs b/lib/PuppeteerSharp/Binding.cs
@@ -3,6 +3,7 @@
 using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
+using PuppeteerSharp.Cdp.Messaging;
 
 namespace PuppeteerSharp
 {
@@ -52,7 +53,7 @@ internal async Task RunAsync(
                             {
                                 switch (handle.RemoteObject.Subtype)
                                 {
-                                    case Messaging.RemoteObjectSubtype.Node:
+                                    case RemoteObjectSubtype.Node:
                                         args[index] = handle;
                                         break;
 

diff --git a/lib/PuppeteerSharp/BindingUtils.cs b/lib/PuppeteerSharp/BindingUtils.cs
@@ -4,8 +4,8 @@
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using PuppeteerSharp.Cdp.Messaging;
 using PuppeteerSharp.Helpers.Json;
-using PuppeteerSharp.Messaging;
 
 namespace PuppeteerSharp
 {

diff --git a/lib/PuppeteerSharp/Browser.cs b/lib/PuppeteerSharp/Browser.cs
@@ -6,8 +6,8 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using PuppeteerSharp.Cdp;
+using PuppeteerSharp.Cdp.Messaging;
 using PuppeteerSharp.Helpers;
-using PuppeteerSharp.Messaging;
 
 namespace PuppeteerSharp
 {

diff --git a/lib/PuppeteerSharp/BrowserContext.cs b/lib/PuppeteerSharp/BrowserContext.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using PuppeteerSharp.Messaging;
+using PuppeteerSharp.Cdp.Messaging;
 
 namespace PuppeteerSharp
 {

diff --git a/lib/PuppeteerSharp/BrowserContextOptions.cs b/lib/PuppeteerSharp/BrowserContextOptions.cs
@@ -8,7 +8,6 @@
 using Microsoft.Extensions.Logging;
 using PuppeteerSharp.Helpers;
 using PuppeteerSharp.Helpers.Json;
-using PuppeteerSharp.Messaging;
 using PuppeteerSharp.QueryHandlers;
 
 namespace PuppeteerSharp