Network refactor (#1923)

Author: kblok

.github/workflows/demo.yml

@@ -2,8 +2,14 @@ name: Demo Project
 
 on:
   push:
+    branches:
+      - master
+      - release-*
   pull_request:
-    branches: [ master ]
+    branches: [master]
+    paths:
+      - "**.cs"
+      - "**.csproj"
 
 jobs:
   build:

.github/workflows/dotnet.yml

@@ -2,6 +2,9 @@ name: build
 
 on:
   push:
+    branches:
+      - master
+      - release-*
   pull_request:
     branches: [ master ]
     paths:

lib/PuppeteerSharp.Tests/AccessibilityTests/AccessibilityTests.cs

@@ -1,6 +1,4 @@
-using System;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
 using PuppeteerSharp.PageAccessibility;
 using PuppeteerSharp.Tests.Attributes;
 using PuppeteerSharp.Xunit;
@@ -97,6 +95,7 @@ await Page.SetContentAsync(@"
                             Role= "combobox",
                             Name= "",
                             Value= "First Option",
+                            HasPopup = "menu",
                             Children= new SerializedAXNode[]{
                                 new SerializedAXNode
                                 {
@@ -162,7 +161,8 @@ public async Task RoleDescription()
         {
             await Page.SetContentAsync("<div tabIndex=-1 aria-roledescription='foo'>Hi</div>");
             var snapshot = await Page.Accessibility.SnapshotAsync();
-            Assert.Equal("foo", snapshot.Children[0].RoleDescription);
+            // See https://chromium-review.googlesource.com/c/chromium/src/+/3088862
+            Assert.Null(snapshot.Children[0].RoleDescription);
         }
 
         [PuppeteerTest("accessibility.spec.ts", "Accessibility", "orientation")]

lib/PuppeteerSharp.Tests/AccessibilityTests/RootOptionTests.cs

@@ -60,12 +60,13 @@ await Page.SetContentAsync(@"
             ");
 
             var menu = await Page.QuerySelectorAsync("div[role=\"menu\"]");
-            Assert.Equal(
-                new SerializedAXNode
-                {
-                    Role = "menu",
-                    Name = "My Menu",
-                    Children = new[]
+            var snapshot = await Page.Accessibility.SnapshotAsync(new AccessibilitySnapshotOptions { Root = menu });
+            var nodeToCheck = new SerializedAXNode
+            {
+                Role = "menu",
+                Name = "My Menu",
+                Orientation = "vertical",
+                Children = new[]
                     {
                         new SerializedAXNode
                         {
@@ -83,8 +84,9 @@ await Page.SetContentAsync(@"
                             Name = "Third Item"
                         }
                     }
-                },
-                await Page.Accessibility.SnapshotAsync(new AccessibilitySnapshotOptions { Root = menu }));
+            };
+
+            Assert.Equal(nodeToCheck, snapshot);
         }
 
         [PuppeteerTest("accessibility.spec.ts", "root option", "should return null when the element is no longer in DOM")]

lib/PuppeteerSharp.Tests/HeadfulTests/HeadfulTests.cs

@@ -72,7 +72,7 @@ public async Task ShouldHaveDefaultUrlWhenLaunchingBrowser()
         }
 
         [PuppeteerTest("headful.spec.ts", "HEADFUL", "headless should be able to read cookies written by headful")]
-        [SkipBrowserFact(skipFirefox: true)]
+        [PuppeteerFact(Skip = "Puppeteer ignores this in windows we do not have a platform filter yet")]
         public async Task HeadlessShouldBeAbleToReadCookiesWrittenByHeadful()
         {
             using (var userDataDir = new TempDirectory())

lib/PuppeteerSharp.Tests/NetworkTests/NetworkEventTests.cs

@@ -1,6 +1,3 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Features;
-using Newtonsoft.Json.Linq;
 using PuppeteerSharp.Tests.Attributes;
 using PuppeteerSharp.Xunit;
 using System.Collections.Generic;
@@ -129,7 +126,7 @@ public async Task ShouldFireEventsInProperOrder()
             Page.Response += (_, _) => events.Add("response");
             Page.RequestFinished += (_, _) => events.Add("requestfinished");
             await Page.GoToAsync(TestConstants.EmptyPage);
-            Assert.Equal(new[] { "request", "response", "requestfinished" }, events);
+            Assert.Equal(new[] { "request", "response", "requestfinished" }, events.ToArray());
         }
 
         [PuppeteerTest("network.spec.ts", "Network Events", "should support redirects")]
@@ -144,14 +141,15 @@ public async Task ShouldSupportRedirects()
             Server.SetRedirect("/foo.html", "/empty.html");
             const string FOO_URL = TestConstants.ServerUrl + "/foo.html";
             var response = await Page.GoToAsync(FOO_URL);
+            System.Console.WriteLine(string.Concat(events, ','));
             Assert.Equal(new[] {
                 $"GET {FOO_URL}",
                 $"302 {FOO_URL}",
                 $"DONE {FOO_URL}",
                 $"GET {TestConstants.EmptyPage}",
                 $"200 {TestConstants.EmptyPage}",
                 $"DONE {TestConstants.EmptyPage}"
-            }, events);
+            }, events.ToArray());
 
             // Check redirect chain
             var redirectChain = response.Request.RedirectChain;

lib/PuppeteerSharp.Tests/NetworkTests/ResponseJsonTests.cs

@@ -1,8 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
 using Newtonsoft.Json.Linq;
 using PuppeteerSharp.Tests.Attributes;
 using PuppeteerSharp.Xunit;

lib/PuppeteerSharp/AddTagOptions.cs

@@ -26,4 +26,4 @@ public class AddTagOptions
         /// <seealso href="https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script"/>
         public string Type { get; set; }
     }
-}
+}

lib/PuppeteerSharp/BoxModel.cs

@@ -39,4 +39,4 @@ internal BoxModel()
         /// </summary>
         public int Height { get; internal set; }
     }
-}
+}

lib/PuppeteerSharp/BoxModelPoint.cs

@@ -15,4 +15,4 @@ public struct BoxModelPoint
         /// </summary>
         public decimal Y { get; set; }
     }
-}
+}