Add missing OOPIF test in headful (#1767)

* Add missing OOPIF test in headful

* feature complete

* Fix accessibility tests

* one more fix

Author: kblok

lib/PuppeteerSharp.Tests/AccessibilityTests/AccessibilityTests.cs

@@ -43,13 +43,13 @@ await Page.SetContentAsync(@"
 
             var nodeToCheck = new SerializedAXNode
             {
-                Role = "WebArea",
+                Role = "RootWebArea",
                 Name = "Accessibility Test",
                 Children = new SerializedAXNode[]
                     {
                         new SerializedAXNode
                         {
-                            Role = "text",
+                            Role = "StaticText",
                             Name = "Hello World"
                         },
                         new SerializedAXNode
@@ -143,7 +143,7 @@ public async Task ShouldReportUninterestingNodes()
                             {
                                 new SerializedAXNode
                                 {
-                                    Role = "text",
+                                    Role = "StaticText",
                                     Name = "hi"
                                 }
                             }
@@ -213,7 +213,7 @@ await Page.SetContentAsync(@"
             Assert.Equal(
                 new SerializedAXNode
                 {
-                    Role = "WebArea",
+                    Role = "RootWebArea",
                     Name = "",
                     Children = new SerializedAXNode[]
                     {
@@ -251,7 +251,7 @@ await Page.SetContentAsync(@"
                     {
                         new SerializedAXNode
                         {
-                            Role = "text",
+                            Role = "StaticText",
                             Name = "Edit this image:"
                         },
                         new SerializedAXNode
@@ -278,11 +278,12 @@ await Page.SetContentAsync(@"
                     Role = "textbox",
                     Name = "",
                     Value = "Edit this image: ",
+                    Multiline = true,
                     Children = new SerializedAXNode[]
                     {
                         new SerializedAXNode
                         {
-                            Role = "text",
+                            Role = "StaticText",
                             Name = "Edit this image:"
                         },
                         new SerializedAXNode
@@ -305,22 +306,8 @@ public async Task PlainTextFieldWithRoleShouldNotHaveChildren()
                 {
                     Role = "textbox",
                     Name = "",
-                    Value = "Edit this image:"
-                },
-                (await Page.Accessibility.SnapshotAsync()).Children[0]);
-        }
-
-        [PuppeteerTest("accessibility.spec.ts", "plaintext contenteditable", "plain text field without role should not have content")]
-        [SkipBrowserFact(skipFirefox: true)]
-        public async Task PlainTextFieldWithTabindexAndWithoutRoleShouldNotHaveContent()
-        {
-            await Page.SetContentAsync("<div contenteditable='plaintext-only' role='textbox' tabIndex=0>Edit this image:<img src='fakeimage.png' alt='my fake image'></div>");
-            Assert.Equal(
-                new SerializedAXNode
-                {
-                    Role = "textbox",
-                    Name = "",
-                    Value = "Edit this image:"
+                    Value = "Edit this image:",
+                    Multiline = true,
                 },
                 (await Page.Accessibility.SnapshotAsync()).Children[0]);
         }

lib/PuppeteerSharp.Tests/AccessibilityTests/RootOptionTests.cs

@@ -122,7 +122,7 @@ public async Task ShouldSupportTheInterestingOnlyOption()
                             {
                                 new SerializedAXNode
                                 {
-                                    Role = "text",
+                                    Role = "StaticText",
                                     Name = "My Button",
                                 }
                             }

lib/PuppeteerSharp.Tests/Assets/simple-extension/content-script.js

@@ -1,3 +1,2 @@
 console.log('hey from the content-script');
 self.thisIsTheContentScript = true;
-

lib/PuppeteerSharp.Tests/Assets/simple-extension/index.js

@@ -1,2 +1,2 @@
 // Mock script for background extension
-window.MAGIC = 42;
+window.MAGIC = 42;

lib/PuppeteerSharp.Tests/HeadfulTests/HeadfulTests.cs

@@ -1,7 +1,9 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using PuppeteerSharp.Helpers;
+using PuppeteerSharp.Messaging;
 using PuppeteerSharp.Tests.Attributes;
 using PuppeteerSharp.Xunit;
 using Xunit;
@@ -12,8 +14,17 @@ namespace PuppeteerSharp.Tests.HeadfulTests
     [Collection(TestConstants.TestFixtureCollectionName)]
     public class HeadfulTests : PuppeteerBaseTest
     {
+        private readonly LaunchOptions _forcedOopifOptions;
+        
         public HeadfulTests(ITestOutputHelper output) : base(output)
         {
+            _forcedOopifOptions = TestConstants.DefaultBrowserOptions();
+            _forcedOopifOptions.Headless =  false;
+            _forcedOopifOptions.Devtools = true;
+            _forcedOopifOptions.Args = new[] {
+                $"--host-rules=\"MAP oopifdomain 127.0.0.1\"",
+                $"--isolate-origins=\"{TestConstants.ServerUrl.Replace("localhost", "oopifdomain")}\""
+            };
         }
 
         [PuppeteerTest("headful.spec.ts", "HEADFUL", "background_page target type should be available")]
@@ -117,6 +128,69 @@ await page.EvaluateFunctionHandleAsync(@"() => {
             }
         }
 
+        [PuppeteerTest("headful.spec.ts", "HEADFUL", "OOPIF: should expose events within OOPIFs")]
+        [SkipBrowserFact(skipFirefox: true)]
+        public async Task OOPIFShouldExposeEventsWithinOOPIFs()
+        {
+            await using (var browser = await Puppeteer.LaunchAsync(_forcedOopifOptions))
+            await using (var page = await browser.NewPageAsync())
+            {
+                // Setup our session listeners to observe OOPIF activity.
+                var session = await page.Target.CreateCDPSessionAsync();
+                var networkEvents = new List<string>();
+                var otherSessions = new List<CDPSession>();
+
+                await session.SendAsync("Target.setAutoAttach", new TargetSetAutoAttachRequest
+                {
+                    AutoAttach = true,
+                    Flatten = true,
+                    WaitForDebuggerOnStart = true,
+                });
+
+                session.SessionAttached += async (_, e) =>
+                {
+                    otherSessions.Add(e.Session);
+
+                    await e.Session.SendAsync("Network.enable");
+                    await e.Session.SendAsync("Runtime.runIfWaitingForDebugger");
+
+                    e.Session.MessageReceived += (_, e) =>
+                    {
+                        if (e.MessageID.Equals("Network.requestWillBeSent", StringComparison.CurrentCultureIgnoreCase))
+                        {
+                            networkEvents.Add(e.MessageData.SelectToken("request").SelectToken("url").ToObject<string>());
+                        }
+                    };
+                };
+
+                // Navigate to the empty page and add an OOPIF iframe with at least one request.
+                await page.GoToAsync(TestConstants.EmptyPage);
+                await page.EvaluateFunctionAsync(@"(frameUrl) => {
+                    const frame = document.createElement('iframe');
+                    frame.setAttribute('src', frameUrl);
+                    document.body.appendChild(frame);
+                    return new Promise((x, y) => {
+                        frame.onload = x;
+                        frame.onerror = y;
+                    });
+                }", TestConstants.ServerUrl.Replace("localhost", "oopifdomain") + "/one-style.html");
+                await page.WaitForSelectorAsync("iframe");
+
+                // Ensure we found the iframe session.
+                Assert.Single(otherSessions);
+
+                // Resume the iframe and trigger another request.
+                var iframeSession = otherSessions[0];
+                await iframeSession.SendAsync("Runtime.evaluate", new RuntimeEvaluateRequest {
+                    Expression = "fetch('/fetch')",
+                    AwaitPromise = true,
+                });
+                await browser.CloseAsync();
+
+                Assert.Contains($"http://oopifdomain:{TestConstants.Port}/fetch", networkEvents);
+            }
+        }
+
         [PuppeteerTest("headful.spec.ts", "HEADFUL", "should close browser with beforeunload page")]
         [SkipBrowserFact(skipFirefox: true)]
         public async Task ShouldCloseBrowserWithBeforeunloadPage()
@@ -143,7 +217,7 @@ public async Task ShouldOpenDevtoolsWhenDevtoolsTrueOptionIsGiven()
                 var context = await browser.CreateIncognitoBrowserContextAsync();
                 await Task.WhenAll(
                     context.NewPageAsync(),
-                    context.WaitForTargetAsync(target => target.Url.Contains("devtools://")));
+                    browser.WaitForTargetAsync(target => target.Url.Contains("devtools://")));
             }
         }
     }

lib/PuppeteerSharp.Tests/TestConstants.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using Microsoft.Extensions.Logging;
 using PuppeteerSharp.Mobile;
-using Xunit.Abstractions;
+using PuppeteerSharp.Helpers;
+using System.Reflection;
 
 namespace PuppeteerSharp.Tests
 {
@@ -22,14 +22,14 @@ public static class TestConstants
         public static readonly string CrossProcessHttpPrefix = "http://127.0.0.1:8081";
         public static readonly string EmptyPage = $"{ServerUrl}/empty.html";
         public static readonly string CrossProcessUrl = ServerIpUrl;
-        public static readonly string ExtensionPath = Path.Combine(Directory.GetCurrentDirectory(), "Assets", "simple-extension");
+        public static readonly string ExtensionPath = Path.Combine(AppContext.BaseDirectory, "Assets", "simple-extension");
         public static readonly bool IsChrome = Environment.GetEnvironmentVariable("PRODUCT") != "FIREFOX";
 
         public static readonly DeviceDescriptor IPhone = Puppeteer.Devices[DeviceDescriptorName.IPhone6];
         public static readonly DeviceDescriptor IPhone6Landscape = Puppeteer.Devices[DeviceDescriptorName.IPhone6Landscape];
 
         public static ILoggerFactory LoggerFactory { get; private set; }
-        public static string FileToUpload => Path.Combine(Directory.GetCurrentDirectory(), "Assets", "file-to-upload.txt");
+        public static string FileToUpload => Path.Combine(AppContext.BaseDirectory, "Assets", "file-to-upload.txt");
 
         public static readonly IEnumerable<string> NestedFramesDumpResult = new List<string>()
         {
@@ -60,8 +60,8 @@ public static class TestConstants
             Headless = false,
             Args = new[]
             {
-                $"--disable-extensions-except={ExtensionPath}",
-                $"--load-extension={ExtensionPath}"
+                $"--disable-extensions-except={ExtensionPath.Quote()}",
+                $"--load-extension={ExtensionPath.Quote()}"
             }
         };
     }

lib/PuppeteerSharp/BrowserFetcher.cs

@@ -60,7 +60,7 @@ public class BrowserFetcher
         /// <summary>
         /// Default Chromium revision.
         /// </summary>
-        public const string DefaultChromiumRevision = "848005";
+        public const string DefaultChromiumRevision = "884014";
 
         /// <summary>
         /// Default Chromium revision.

lib/PuppeteerSharp/CDPSession.cs

@@ -56,33 +56,42 @@ internal CDPSession(Connection connection, TargetType targetType, string session
         /// </summary>
         /// <value>The target type.</value>
         public TargetType TargetType { get; }
+
         /// <summary>
         /// Gets the session identifier.
         /// </summary>
         /// <value>The session identifier.</value>
         public string SessionId { get; }
+
         /// <summary>
         /// Gets the connection.
         /// </summary>
         /// <value>The connection.</value>
         internal Connection Connection { get; private set; }
+
         /// <summary>
         /// Occurs when message received from Chromium.
         /// </summary>
         public event EventHandler<MessageEventArgs> MessageReceived;
+
         /// <summary>
         /// Occurs when the connection is closed.
         /// </summary>
         public event EventHandler Disconnected;
+
+        internal event EventHandler<SessionAttachedEventArgs> SessionAttached;
+
         /// <summary>
         /// Gets or sets a value indicating whether this <see cref="CDPSession"/> is closed.
         /// </summary>
         /// <value><c>true</c> if is closed; otherwise, <c>false</c>.</value>
         public bool IsClosed { get; internal set; }
+
         /// <summary>
         /// Connection close reason.
         /// </summary>
         public string CloseReason { get; private set; }
+
         /// <summary>
         /// Gets the logger factory.
         /// </summary>
@@ -221,6 +230,9 @@ internal void Close(string closeReason)
             Connection = null;
         }
 
+        internal void OnSessionAttached(CDPSession session)
+            => SessionAttached?.Invoke(this, new SessionAttachedEventArgs { Session = session });
+
         #endregion
     }
 }

lib/PuppeteerSharp/Connection.cs

@@ -51,24 +51,31 @@ internal Connection(string url, int delay, bool enqueueAsyncMessages, IConnectio
         /// </summary>
         /// <value>The URL.</value>
         public string Url { get; }
+
         /// <summary>
         /// Gets the sleep time when a message is received.
         /// </summary>
         /// <value>The delay.</value>
         public int Delay { get; }
+
         /// <summary>
         /// Gets the Connection transport.
         /// </summary>
         /// <value>Connection transport.</value>
         public IConnectionTransport Transport { get; }
+
         /// <summary>
         /// Occurs when the connection is closed.
         /// </summary>
         public event EventHandler Disconnected;
+
         /// <summary>
         /// Occurs when a message from chromium is received.
         /// </summary>
         public event EventHandler<MessageEventArgs> MessageReceived;
+
+        internal event EventHandler<SessionAttachedEventArgs> SessionAttached;
+
         /// <summary>
         /// Gets or sets a value indicating whether this <see cref="Connection"/> is closed.
         /// </summary>
@@ -236,6 +243,13 @@ private void ProcessIncomingMessage(ConnectionResponse obj)
                 var sessionId = param.SessionId;
                 var session = new CDPSession(this, param.TargetInfo.Type, sessionId);
                 _asyncSessions.AddItem(sessionId, session);
+
+                SessionAttached?.Invoke(this, new SessionAttachedEventArgs { Session = session });
+
+                if (obj.SessionId != null && _sessions.TryGetValue(obj.SessionId, out var parentSession))
+                {
+                    parentSession.OnSessionAttached(session);
+                }
             }
             else if (method == "Target.detachedFromTarget")
             {

lib/PuppeteerSharp/Page.cs

@@ -2244,7 +2244,7 @@ private async Task OnAttachedToTargetAsync(TargetAttachedToTargetResponse e)
         {
             var targetInfo = e.TargetInfo;
             var sessionId = e.SessionId;
-            if (targetInfo.Type != TargetType.Worker)
+            if (targetInfo.Type != TargetType.Worker && targetInfo.Type != TargetType.iFrame)
             {
                 try
                 {