Merge pull request #35 from Codeuctivity/MacOsExperiment

stesee · web-flow · commit 551c0b296c00 · 2022-11-23T07:55:33.000+01:00
added MacOS to build and test
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest, ubuntu-latest]
+        os: [windows-latest, ubuntu-latest, macos-latest]
     steps:
       - uses: actions/checkout@v3
       - name: Setup .NET
diff --git a/Codeuctivity.HtmlRendererCliTests/FactRunableOnWindowsAttribute.cs b/Codeuctivity.HtmlRendererCliTests/FactRunableOnWindowsAttribute.cs
diff --git a/Codeuctivity.HtmlRendererTests/RendererTests.cs b/Codeuctivity.HtmlRendererTests/RendererTests.cs
@@ -33,7 +33,7 @@ public async Task ShouldConvertHtmlToPdf(string testFileName)
 
                 using var rasterize = new Rasterizer();
 
-                if (!IsRunningOnWslOrAzure())
+                if (!IsRunningOnWslOrAzureOrMacos())
                 {
                     var actualImages = await rasterize.ConvertToPngAsync(actualFilePath, actualImagePathDirectory);
                     Assert.Single(actualImages);
@@ -43,16 +43,21 @@ public async Task ShouldConvertHtmlToPdf(string testFileName)
             await ChromiumProcessDisposedAsserter.AssertNoChromeProcessIsRunning();
         }
 
-        private static bool IsRunningOnWslOrAzure()
+        private static bool IsRunningOnWslOrAzureOrMacos()
         {
+            if(RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || RuntimeInformation.IsOSPlatform(OSPlatform.FreeBSD))
+            {
+                return true;
+            }
+
             if (!RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
             {
                 return false;
             }
 
             var version = File.ReadAllText("/proc/version");
-            var IsAzure = version.IndexOf("Microsoft", StringComparison.OrdinalIgnoreCase) >= 0;
-            var IsWsl = version.IndexOf("azure", StringComparison.OrdinalIgnoreCase) >= 0;
+            var IsAzure = version.IndexOf("azure", StringComparison.OrdinalIgnoreCase) >= 0;
+            var IsWsl = version.IndexOf("Microsoft", StringComparison.OrdinalIgnoreCase) >= 0;
 
             return IsWsl || IsAzure;
         }
@@ -74,7 +79,7 @@ public async Task ShouldConvertHtmlToPng(string testFileName)
             {
                 await chromiumRenderer.ConvertHtmlToPng(sourceHtmlFilePath, actualFilePath);
 
-                DocumentAsserter.AssertImageIsEqual(actualFilePath, expectReferenceFilePath, 7000);
+                DocumentAsserter.AssertImageIsEqual(actualFilePath, expectReferenceFilePath, 7200);
             }
 
             await ChromiumProcessDisposedAsserter.AssertNoChromeProcessIsRunning();
diff --git a/README.md b/README.md
@@ -5,7 +5,6 @@
 Renders HTML to PDF or PNGs
 
 - Based on PuppeteerSharp
-- Focused on Windows and Linux support
 - Give the cli version a try - [Codeuctivity.HtmlRendererCli.exe](https://github.com/Codeuctivity/PuppeteerSharp.Renderer/releases)
 
 ## Render HTML to PDF

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public async Task ShouldConvertHtmlToPdf(string testFileName)`
`33`	`33`
`34`	`34`	`using var rasterize = new Rasterizer();`
`35`	`35`
`36`		`- if (!IsRunningOnWslOrAzure())`
	`36`	`+ if (!IsRunningOnWslOrAzureOrMacos())`
`37`	`37`	`{`
`38`	`38`	`var actualImages = await rasterize.ConvertToPngAsync(actualFilePath, actualImagePathDirectory);`
`39`	`39`	`Assert.Single(actualImages);`
`@@ -43,16 +43,21 @@ public async Task ShouldConvertHtmlToPdf(string testFileName)`
`43`	`43`	`await ChromiumProcessDisposedAsserter.AssertNoChromeProcessIsRunning();`
`44`	`44`	`}`
`45`	`45`
`46`		`- private static bool IsRunningOnWslOrAzure()`
	`46`	`+ private static bool IsRunningOnWslOrAzureOrMacos()`
`47`	`47`	`{`
	`48`	`+ if(RuntimeInformation.IsOSPlatform(OSPlatform.OSX) \|\| RuntimeInformation.IsOSPlatform(OSPlatform.FreeBSD))`
	`49`	`+ {`
	`50`	`+ return true;`
	`51`	`+ }`
	`52`	`+`
`48`	`53`	`if (!RuntimeInformation.IsOSPlatform(OSPlatform.Linux))`
`49`	`54`	`{`
`50`	`55`	`return false;`
`51`	`56`	`}`
`52`	`57`
`53`	`58`	`var version = File.ReadAllText("/proc/version");`
`54`		`- var IsAzure = version.IndexOf("Microsoft", StringComparison.OrdinalIgnoreCase) >= 0;`
`55`		`- var IsWsl = version.IndexOf("azure", StringComparison.OrdinalIgnoreCase) >= 0;`
	`59`	`+ var IsAzure = version.IndexOf("azure", StringComparison.OrdinalIgnoreCase) >= 0;`
	`60`	`+ var IsWsl = version.IndexOf("Microsoft", StringComparison.OrdinalIgnoreCase) >= 0;`
`56`	`61`
`57`	`62`	`return IsWsl \|\| IsAzure;`
`58`	`63`	`}`
`@@ -74,7 +79,7 @@ public async Task ShouldConvertHtmlToPng(string testFileName)`
`74`	`79`	`{`
`75`	`80`	`await chromiumRenderer.ConvertHtmlToPng(sourceHtmlFilePath, actualFilePath);`
`76`	`81`
`77`		`- DocumentAsserter.AssertImageIsEqual(actualFilePath, expectReferenceFilePath, 7000);`
	`82`	`+ DocumentAsserter.AssertImageIsEqual(actualFilePath, expectReferenceFilePath, 7200);`
`78`	`83`	`}`
`79`	`84`
`80`	`85`	`await ChromiumProcessDisposedAsserter.AssertNoChromeProcessIsRunning();`