Test refactors (#1021)

hardkoded · Mar 19, 2019 · e71b6e9 · e71b6e9
1 parent 23a6434
commit e71b6e9
Show file tree

Hide file tree

Showing 12 changed files with 97 additions and 95 deletions.
diff --git a/lib/PuppeteerSharp.TestServer/wwwroot/frames/nested-frames.html b/lib/PuppeteerSharp.TestServer/wwwroot/frames/nested-frames.html
@@ -1,25 +1,24 @@
-<style>
-body {
-    display: flex;
-}
-
-body iframe {
-    flex-grow: 1;
-    flex-shrink: 1;
-}
-::-webkit-scrollbar{
-    display: none;
-}
-</style>
-<script>
-async function attachFrame(frameId, url) {
-    var frame = document.createElement('iframe');
-    frame.src = url;
-    frame.id = frameId;
-    document.body.appendChild(frame);
-    await new Promise(x => frame.onload = x);
-    return 'kazakh';
-}
-</script>
-<iframe src='./two-frames.html'></iframe>
-<iframe src='./frame.html'></iframe>
+<style>
+    body {
+        display: flex;
+    }
+
+        body iframe {
+            flex-grow: 1;
+            flex-shrink: 1;
+        }
+
+    ::-webkit-scrollbar {
+        display: none;
+    }
+</style>
+<script>async function attachFrame(frameId, url) {
+        var frame = document.createElement('iframe');
+        frame.src = url;
+        frame.id = frameId;
+        document.body.appendChild(frame);
+        await new Promise(x => frame.onload = x);
+        return 'kazakh';
+    }</script>
+<iframe src='./two-frames.html' name='2frames'></iframe>
+<iframe src='./frame.html' name='aframe'></iframe>
diff --git a/lib/PuppeteerSharp.TestServer/wwwroot/frames/two-frames.html b/lib/PuppeteerSharp.TestServer/wwwroot/frames/two-frames.html
@@ -1,13 +1,13 @@
-<style>
-body {
-    display: flex;
-    flex-direction: column;
-}
-
-body iframe {
-    flex-grow: 1;
-    flex-shrink: 1;
-}
-</style>
-<iframe src='./frame.html'></iframe>
-<iframe src='./frame.html'></iframe>
+<style>
+    body {
+        display: flex;
+        flex-direction: column;
+    }
+
+        body iframe {
+            flex-grow: 1;
+            flex-shrink: 1;
+        }
+</style>
+<iframe src='./frame.html' name='uno'></iframe>
+<iframe src='./frame.html' name='dos'></iframe>
diff --git a/lib/PuppeteerSharp.TestServer/wwwroot/title.html b/lib/PuppeteerSharp.TestServer/wwwroot/title.html
@@ -0,0 +1 @@
+<title>Woof-Woof</title>
diff --git a/lib/PuppeteerSharp.TestServer/wwwroot/wrappedlink.html b/lib/PuppeteerSharp.TestServer/wwwroot/wrappedlink.html
@@ -1,29 +1,31 @@
-<style>
-:root {
-  font-family: monospace;
-}
-
-body {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-div {
-  width: 10ch;
-  word-wrap: break-word;
-  border: 1px solid blue;
-  transform: rotate(33deg);
-  line-height: 8ch;
-  padding: 2ch;
-}
-
-a {
-  margin-left: 7ch;
-}
-</style>
-<div>
-  <a href='#clicked'>123321</a>
-</div>
-<script>
-</script>
+<style>
+    :root {
+        font-family: monospace;
+    }
+
+    body {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+
+    div {
+        width: 10ch;
+        word-wrap: break-word;
+        border: 1px solid blue;
+        transform: rotate(33deg);
+        line-height: 8ch;
+        padding: 2ch;
+    }
+
+    a {
+        margin-left: 7ch;
+    }
+</style>
+<div>
+    <a href='#clicked'>123321</a>
+</div>
+<script>
+document.querySelector('a').addEventListener('click', () => {
+    window.__clicked = true;
+  });</script>
diff --git a/lib/PuppeteerSharp.Tests/FrameTests/FrameManagementTests.cs b/lib/PuppeteerSharp.Tests/FrameTests/FrameManagementTests.cs
@@ -18,8 +18,8 @@ public async Task ShouldHandleNestedFrames()
         {
             await Page.GoToAsync(TestConstants.ServerUrl + "/frames/nested-frames.html");
             Assert.Equal(
-                TestUtils.CompressText(TestConstants.NestedFramesDumpResult),
-                TestUtils.CompressText(FrameUtils.DumpFrames(Page.MainFrame)));
+                TestConstants.NestedFramesDumpResult,
+                FrameUtils.DumpFrames(Page.MainFrame));
         }
 
         [Fact]

diff --git a/lib/PuppeteerSharp.Tests/FrameUtils.cs b/lib/PuppeteerSharp.Tests/FrameUtils.cs
@@ -1,4 +1,5 @@
-using System.Text.RegularExpressions;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace PuppeteerSharp.Tests
@@ -26,12 +27,17 @@ await page.EvaluateFunctionAsync(@"function detachFrame(frameId) {
             }", frameId);
         }
 
-        public static string DumpFrames(Frame frame, string indentation = "")
+        public static IEnumerable<string> DumpFrames(Frame frame, string indentation = "")
         {
-            var result = indentation + Regex.Replace(frame.Url, @":\d{4}", ":<PORT>");
+            var description = indentation + Regex.Replace(frame.Url, @":\d{4}", ":<PORT>");
+            if (!string.IsNullOrEmpty(frame.Name))
+            {
+                description += $" ({frame.Name})";
+            }
+            var result = new List<string>() { description };
             foreach (var child in frame.ChildFrames)
             {
-                result += "\n" + DumpFrames(child, "    " + indentation);
+                result.AddRange(DumpFrames(child, "    " + indentation));
             }
 
             return result;

diff --git a/lib/PuppeteerSharp.Tests/InputTests/InputTests.cs b/lib/PuppeteerSharp.Tests/InputTests/InputTests.cs
@@ -10,7 +10,6 @@ namespace PuppeteerSharp.Tests.InputTests
     [Collection("PuppeteerLoaderFixture collection")]
     public class InputTests : PuppeteerPageBaseTest
     {
-        private Task dummy;
         private const string Dimensions = @"function dimensions() {
             const rect = document.querySelector('textarea').getBoundingClientRect();
             return {

diff --git a/lib/PuppeteerSharp.Tests/PageTests/EvaluateTests.cs b/lib/PuppeteerSharp.Tests/PageTests/EvaluateTests.cs
@@ -125,10 +125,7 @@ public async Task ShouldProperlySerializeNullFields()
 
         [Fact]
         public async Task ShouldReturnNullForNonSerializableObjects()
-        {
-            Assert.Null(await Page.EvaluateFunctionAsync("() => window"));
-            Assert.Null(await Page.EvaluateFunctionAsync("() => [Symbol('foo4')]"));
-        }
+            => Assert.Null(await Page.EvaluateFunctionAsync("() => window"));
 
         [Fact]
         public async Task ShouldAcceptElementHandleAsAnArgument()
@@ -258,15 +255,8 @@ public async Task ShouldFailForCircularObject()
         }
 
         [Fact]
-        public Task ShouldSimulateAUserGesture()
-            => Page.EvaluateExpressionAsync(@"(
-            function playAudio()
-            {
-                const audio = document.createElement('audio');
-                audio.src = 'data:audio/wav;base64,UklGRiQAAABXQVZFZm10IBAAAAABAAEARKwAAIhYAQACABAAZGF0YQAAAAA=';
-                // This returns a promise which throws if it was not triggered by a user gesture.
-                return audio.play();
-            })()");
+        public async Task ShouldSimulateAUserGesture()
+            => Assert.True(await Page.EvaluateFunctionAsync<bool>("() => document.execCommand('copy')"));
 
         [Fact]
         public async Task ShouldThrowANiceErrorAfterANavigation()

diff --git a/lib/PuppeteerSharp.Tests/PageTests/TitleTests.cs b/lib/PuppeteerSharp.Tests/PageTests/TitleTests.cs
@@ -14,8 +14,8 @@ public TitleTests(ITestOutputHelper output) : base(output)
         [Fact]
         public async Task ShouldReturnThePageTitle()
         {
-            await Page.GoToAsync(TestConstants.ServerUrl + "/input/button.html");
-            Assert.Equal("Button test", await Page.GetTitleAsync());
+            await Page.GoToAsync(TestConstants.ServerUrl + "/title.html");
+            Assert.Equal("Woof-Woof", await Page.GetTitleAsync());
         }
     }
 }
diff --git a/lib/PuppeteerSharp.Tests/PuppeteerTests/PuppeteerConnectTests.cs b/lib/PuppeteerSharp.Tests/PuppeteerTests/PuppeteerConnectTests.cs
@@ -89,7 +89,7 @@ public async Task ShouldBeAbleToReconnectToADisconnectedBrowser()
                 var restoredPage = pages.FirstOrDefault(x => x.Url == url);
                 Assert.NotNull(restoredPage);
                 var frameDump = FrameUtils.DumpFrames(restoredPage.MainFrame);
-                Assert.Equal(TestUtils.CompressText(TestConstants.NestedFramesDumpResult), TestUtils.CompressText(frameDump));
+                Assert.Equal(TestConstants.NestedFramesDumpResult, frameDump);
                 var response = await restoredPage.EvaluateExpressionAsync<int>("7 * 8");
                 Assert.Equal(56, response);
             }

diff --git a/lib/PuppeteerSharp.Tests/TestConstants.cs b/lib/PuppeteerSharp.Tests/TestConstants.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using Microsoft.Extensions.Logging;
@@ -26,11 +27,14 @@ public static class TestConstants
 
         public static ILoggerFactory LoggerFactory { get; private set; }
 
-        public static readonly string NestedFramesDumpResult = @"http://localhost:<PORT>/frames/nested-frames.html
-    http://localhost:<PORT>/frames/two-frames.html
-        http://localhost:<PORT>/frames/frame.html
-        http://localhost:<PORT>/frames/frame.html
-    http://localhost:<PORT>/frames/frame.html";
+        public static readonly IEnumerable<string> NestedFramesDumpResult = new List<string>()
+        {
+            "http://localhost:<PORT>/frames/nested-frames.html",
+            "    http://localhost:<PORT>/frames/two-frames.html (2frames)",
+            "        http://localhost:<PORT>/frames/frame.html (uno)",
+            "        http://localhost:<PORT>/frames/frame.html (dos)",
+            "    http://localhost:<PORT>/frames/frame.html (aframe)"
+        };
 
         public static LaunchOptions DefaultBrowserOptions() => new LaunchOptions
         {

diff --git a/lib/PuppeteerSharp/FrameTree.cs b/lib/PuppeteerSharp/FrameTree.cs
@@ -47,6 +47,7 @@ private void LoadChilds(FrameTree frame, PageGetFrameTreeItem frameTree)
                         Frame = new FramePayload
                         {
                             Id = childFrame.Id,
+                            Name = childFrame.Name,
                             ParentId = childFrame.ParentId,
                             Url = childFrame.Url
                         }