Merge pull request #2741 from hardkoded/support-margin-with-no-units

Fix Pdf Margin with no units
hardkoded · Aug 16, 2024 · 5cc4e17 · 5cc4e17
2 parents a3cca3a + 188e298
commit 5cc4e17
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 3 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": "This is flaky on CI/CD",
+    "testIdPattern": "[oopif.spec] OOPIF should provide access to elements",
+    "platforms": ["win32"],
+    "parameters": ["chrome"],
+    "expectations": ["FAIL"]
+  },
   {
     "comment": "",
     "testIdPattern": "[puppeteer-sharp] *",

diff --git a/lib/PuppeteerSharp.Tests/NavigationTests/PageWaitForNavigationTests.cs b/lib/PuppeteerSharp.Tests/NavigationTests/PageWaitForNavigationTests.cs
@@ -52,7 +52,7 @@ public async Task ShouldWorkWithBothDomcontentloadedAndLoad()
                 }
             }).ContinueWith(_ => bothFired = true);
 
-            await waitForRequestTask.WithTimeout();
+            await waitForRequestTask.WithTimeout(5_000);
             await domContentLoadedTask.WithTimeout();
             Assert.That(bothFired, Is.False);
             responseCompleted.SetResult(true);

diff --git a/lib/PuppeteerSharp.Tests/PageTests/PdfTests.cs b/lib/PuppeteerSharp.Tests/PageTests/PdfTests.cs
@@ -143,5 +143,27 @@ public void PdfOptionsShouldBeSerializable()
             var newPdfOptions = JsonSerializer.Deserialize<PdfOptions>(serialized);
             Assert.That(newPdfOptions, Is.EqualTo(pdfOptions));
         }
+
+        [Test]
+        public void PdfOptionsShouldWorkWithMarginWithNoUnits()
+        {
+            var pdfOptions = new PdfOptions
+            {
+                Format = PaperFormat.A4,
+                DisplayHeaderFooter = true,
+                MarginOptions = new MarginOptions
+                {
+                    Top = "0",
+                    Right = "0",
+                    Bottom = "0",
+                    Left = "0"
+                },
+                FooterTemplate = "<div id=\"footer-template\" style=\"font-size:10px !important; color:#808080; padding-left:10px\">- <span class=\"pageNumber\"></span> - </div>"
+            };
+
+            var serialized = JsonSerializer.Serialize(pdfOptions);
+            var newPdfOptions = JsonSerializer.Deserialize<PdfOptions>(serialized);
+            Assert.That(newPdfOptions, Is.EqualTo(pdfOptions));
+        }
     }
 }
diff --git a/lib/PuppeteerSharp/Cdp/CdpPage.cs b/lib/PuppeteerSharp/Cdp/CdpPage.cs
@@ -1221,14 +1221,14 @@ private decimal ConvertPrintParameterToInches(object parameter)
         }
 
         decimal pixels;
-        if (parameter is decimal || parameter is int)
+        if (parameter is decimal or int)
         {
             pixels = Convert.ToDecimal(parameter, CultureInfo.CurrentCulture);
         }
         else
         {
             var text = parameter.ToString();
-            var unit = text.Substring(text.Length - 2).ToLower(CultureInfo.CurrentCulture);
+            var unit = text.Length > 2 ? text.Substring(text.Length - 2).ToLower(CultureInfo.CurrentCulture) : string.Empty;
             string valueText;
             if (_unitToPixels.ContainsKey(unit))
             {