diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 70f1d31..dc49971 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,7 +2,7 @@ CS1591;CS0649;NU1608;NU1109 - 0.1.0-beta.3 + 0.1.0-beta.4 0.1.0 preview Email, Preview, Verify diff --git a/src/Tests/ModuleInitializer.cs b/src/Tests/ModuleInitializer.cs index 0e3791b..5bc6a29 100644 --- a/src/Tests/ModuleInitializer.cs +++ b/src/Tests/ModuleInitializer.cs @@ -22,6 +22,6 @@ public static void InitOther() { VerifyDiffPlex.Initialize(OutputType.Compact); VerifierSettings.InitializePlugins(); - VerifyImageMagick.RegisterComparers(.01); + VerifyImageMagick.RegisterComparers(); } } \ No newline at end of file diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AOLBasic.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AOLBasic.verified.jpg deleted file mode 100644 index fb4b53c..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AOLBasic.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AOLBasic.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AOLBasic.verified.webp new file mode 100644 index 0000000..68adc33 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AOLBasic.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AOLChrome.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AOLChrome.verified.jpg deleted file mode 100644 index de28713..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AOLChrome.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AOLChrome.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AOLChrome.verified.webp new file mode 100644 index 0000000..a05e53f Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AOLChrome.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AOLFirefox.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AOLFirefox.verified.jpg deleted file mode 100644 index 4a11944..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AOLFirefox.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AOLFirefox.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AOLFirefox.verified.webp new file mode 100644 index 0000000..d75c3a5 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AOLFirefox.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Android9.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Android9.verified.jpg deleted file mode 100644 index 84d6d1d..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Android9.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Android9.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Android9.verified.webp new file mode 100644 index 0000000..0f410c3 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Android9.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AppleMailDark.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AppleMailDark.verified.jpg deleted file mode 100644 index cbe343b..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AppleMailDark.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AppleMailDark.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AppleMailDark.verified.webp new file mode 100644 index 0000000..9091955 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AppleMailDark.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AppleMailLight.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AppleMailLight.verified.jpg deleted file mode 100644 index 78c2d72..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AppleMailLight.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AppleMailLight.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AppleMailLight.verified.webp new file mode 100644 index 0000000..ed4f5d2 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=AppleMailLight.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Freenet.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Freenet.verified.jpg deleted file mode 100644 index 7351771..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Freenet.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Freenet.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Freenet.verified.webp new file mode 100644 index 0000000..43251d4 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Freenet.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=GMX.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=GMX.verified.jpg deleted file mode 100644 index 36352ab..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=GMX.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=GMX.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=GMX.verified.webp new file mode 100644 index 0000000..e7146e1 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=GMX.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=GmailFirefox.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=GmailFirefox.verified.jpg deleted file mode 100644 index 480da6a..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=GmailFirefox.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=GmailFirefox.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=GmailFirefox.verified.webp new file mode 100644 index 0000000..ae7f403 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=GmailFirefox.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Mailbirddark.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Mailbirddark.verified.jpg deleted file mode 100644 index a355d54..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Mailbirddark.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Mailbirddark.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Mailbirddark.verified.webp new file mode 100644 index 0000000..12b9fb1 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Mailbirddark.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Mailbirdlight.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Mailbirdlight.verified.jpg deleted file mode 100644 index 4547d35..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Mailbirdlight.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Mailbirdlight.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Mailbirdlight.verified.webp new file mode 100644 index 0000000..2772631 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Mailbirdlight.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Office365Dark.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Office365Dark.verified.jpg deleted file mode 100644 index 2c4b141..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Office365Dark.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Office365Dark.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Office365Dark.verified.webp new file mode 100644 index 0000000..c9e3f30 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Office365Dark.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Office365Light.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Office365Light.verified.jpg deleted file mode 100644 index 76155ff..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Office365Light.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Office365Light.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Office365Light.verified.webp new file mode 100644 index 0000000..9f5c3da Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Office365Light.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2003.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2003.verified.jpg deleted file mode 100644 index e2a6b7e..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2003.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2003.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2003.verified.webp new file mode 100644 index 0000000..a6f9dbd Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2003.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2007.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2007.verified.jpg deleted file mode 100644 index 2fabf05..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2007.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2007.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2007.verified.webp new file mode 100644 index 0000000..aee7a1e Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2007.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2010.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2010.verified.jpg deleted file mode 100644 index eb1095f..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2010.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2010.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2010.verified.webp new file mode 100644 index 0000000..770ad69 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2010.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2013.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2013.verified.jpg deleted file mode 100644 index 02cc313..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2013.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2013.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2013.verified.webp new file mode 100644 index 0000000..3a5ef06 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2013.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2016.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2016.verified.jpg deleted file mode 100644 index 4bdb227..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2016.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2016.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2016.verified.webp new file mode 100644 index 0000000..fb00618 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2016.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2016PlainText.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2016PlainText.verified.jpg deleted file mode 100644 index 15c47d1..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2016PlainText.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2016PlainText.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2016PlainText.verified.webp new file mode 100644 index 0000000..54d7c75 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2016PlainText.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2019.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2019.verified.jpg deleted file mode 100644 index aa50fb8..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2019.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2019.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2019.verified.webp new file mode 100644 index 0000000..b9fdb0b Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2019.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2019MacDark.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2019MacDark.verified.webp similarity index 100% rename from src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2019MacDark.verified.jpg rename to src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2019MacDark.verified.webp diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2019MacLight.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2019MacLight.verified.webp similarity index 100% rename from src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2019MacLight.verified.jpg rename to src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Outlook2019MacLight.verified.webp diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=OutlookWebChrome.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=OutlookWebChrome.verified.jpg deleted file mode 100644 index f43689e..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=OutlookWebChrome.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=OutlookWebChrome.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=OutlookWebChrome.verified.webp new file mode 100644 index 0000000..7220e66 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=OutlookWebChrome.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=OutlookWebDarkModeChrome.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=OutlookWebDarkModeChrome.verified.jpg deleted file mode 100644 index 9c5257b..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=OutlookWebDarkModeChrome.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=OutlookWebDarkModeChrome.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=OutlookWebDarkModeChrome.verified.webp new file mode 100644 index 0000000..75689d3 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=OutlookWebDarkModeChrome.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=OutlookWebDarkModeFirefox.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=OutlookWebDarkModeFirefox.verified.jpg deleted file mode 100644 index 5db7ce4..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=OutlookWebDarkModeFirefox.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=OutlookWebDarkModeFirefox.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=OutlookWebDarkModeFirefox.verified.webp new file mode 100644 index 0000000..3927505 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=OutlookWebDarkModeFirefox.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=OutlookWebFirefox.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=OutlookWebFirefox.verified.jpg deleted file mode 100644 index 549f5f0..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=OutlookWebFirefox.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=OutlookWebFirefox.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=OutlookWebFirefox.verified.webp new file mode 100644 index 0000000..16cf951 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=OutlookWebFirefox.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Postbox6.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Postbox6.verified.jpg deleted file mode 100644 index 7da4b05..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Postbox6.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Postbox6.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Postbox6.verified.webp new file mode 100644 index 0000000..40162cc Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Postbox6.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=RoundcubeChrome.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=RoundcubeChrome.verified.jpg deleted file mode 100644 index 26602ac..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=RoundcubeChrome.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=RoundcubeChrome.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=RoundcubeChrome.verified.webp new file mode 100644 index 0000000..647be72 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=RoundcubeChrome.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Seznam.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Seznam.verified.jpg deleted file mode 100644 index 17f27b6..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Seznam.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Seznam.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Seznam.verified.webp new file mode 100644 index 0000000..9a51171 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Seznam.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Thunderbird.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Thunderbird.verified.jpg deleted file mode 100644 index 78a2269..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Thunderbird.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Thunderbird.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Thunderbird.verified.webp new file mode 100644 index 0000000..7561542 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Thunderbird.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=WPpl.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=WPpl.verified.jpg deleted file mode 100644 index 10ae218..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=WPpl.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=WPpl.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=WPpl.verified.webp new file mode 100644 index 0000000..6df7c16 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=WPpl.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Windows10MailDark.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Windows10MailDark.verified.jpg deleted file mode 100644 index 9c26c17..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Windows10MailDark.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Windows10MailDark.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Windows10MailDark.verified.webp new file mode 100644 index 0000000..747af9a Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Windows10MailDark.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Windows10MailLight.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Windows10MailLight.verified.jpg deleted file mode 100644 index 66b6aa9..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Windows10MailLight.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Windows10MailLight.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Windows10MailLight.verified.webp new file mode 100644 index 0000000..df04b92 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=Windows10MailLight.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=WindowsLiveMail2012.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=WindowsLiveMail2012.verified.jpg deleted file mode 100644 index b529a21..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=WindowsLiveMail2012.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=WindowsLiveMail2012.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=WindowsLiveMail2012.verified.webp new file mode 100644 index 0000000..d8d158b Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=WindowsLiveMail2012.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=YahooBasic.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=YahooBasic.verified.jpg deleted file mode 100644 index 347a26c..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=YahooBasic.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=YahooBasic.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=YahooBasic.verified.webp new file mode 100644 index 0000000..a9593fe Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=YahooBasic.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=YahooChrome.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=YahooChrome.verified.jpg deleted file mode 100644 index 46f7307..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=YahooChrome.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=YahooChrome.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=YahooChrome.verified.webp new file mode 100644 index 0000000..21b91a3 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=YahooChrome.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=YahooFirefox.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=YahooFirefox.verified.jpg deleted file mode 100644 index 0ad87c0..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=YahooFirefox.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=YahooFirefox.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=YahooFirefox.verified.webp new file mode 100644 index 0000000..d857eec Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=YahooFirefox.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=ZimbraDesktop.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=ZimbraDesktop.verified.jpg deleted file mode 100644 index b1ac50f..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=ZimbraDesktop.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=ZimbraDesktop.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=ZimbraDesktop.verified.webp new file mode 100644 index 0000000..96e7d75 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=ZimbraDesktop.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=ZohoDark.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=ZohoDark.verified.jpg deleted file mode 100644 index b766f94..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=ZohoDark.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=ZohoDark.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=ZohoDark.verified.webp new file mode 100644 index 0000000..4780ee3 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=ZohoDark.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=ZohoLight.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=ZohoLight.verified.jpg deleted file mode 100644 index 16bcf75..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=ZohoLight.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=ZohoLight.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=ZohoLight.verified.webp new file mode 100644 index 0000000..7f6e47e Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=ZohoLight.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=eMClient.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=eMClient.verified.jpg deleted file mode 100644 index b01d677..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=eMClient.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=eMClient.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=eMClient.verified.webp new file mode 100644 index 0000000..f777345 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=eMClient.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iCloud.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iCloud.verified.jpg deleted file mode 100644 index aec7f96..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iCloud.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iCloud.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iCloud.verified.webp new file mode 100644 index 0000000..82ec6de Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iCloud.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPadAir.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPadAir.verified.jpg deleted file mode 100644 index f951ac7..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPadAir.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPadAir.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPadAir.verified.webp new file mode 100644 index 0000000..a60cd69 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPadAir.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone11.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone11.verified.jpg deleted file mode 100644 index ed522e4..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone11.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone11.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone11.verified.webp new file mode 100644 index 0000000..43b6c8c Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone11.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone12.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone12.verified.jpg deleted file mode 100644 index 8667e02..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone12.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone12.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone12.verified.webp new file mode 100644 index 0000000..3bcd495 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone12.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone12Pro.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone12Pro.verified.jpg deleted file mode 100644 index 8667e02..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone12Pro.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone12Pro.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone12Pro.verified.webp new file mode 100644 index 0000000..3bcd495 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone12Pro.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone13.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone13.verified.jpg deleted file mode 100644 index 8667e02..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone13.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone13.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone13.verified.webp new file mode 100644 index 0000000..3bcd495 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone13.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone13ProMax.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone13ProMax.verified.jpg deleted file mode 100644 index dac1e1a..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone13ProMax.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone13ProMax.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone13ProMax.verified.webp new file mode 100644 index 0000000..bc0628a Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone13ProMax.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone8.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone8.verified.jpg deleted file mode 100644 index 112a0ed..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone8.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone8.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone8.verified.webp new file mode 100644 index 0000000..2d33a97 Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhone8.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhoneSE.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhoneSE.verified.webp similarity index 100% rename from src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhoneSE.verified.jpg rename to src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=iPhoneSE.verified.webp diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=o2pl.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=o2pl.verified.jpg deleted file mode 100644 index f4e7ddc..0000000 Binary files a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=o2pl.verified.jpg and /dev/null differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=o2pl.verified.webp b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=o2pl.verified.webp new file mode 100644 index 0000000..4e4b51c Binary files /dev/null and b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=o2pl.verified.webp differ diff --git a/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=onetpl.verified.jpg b/src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=onetpl.verified.webp similarity index 100% rename from src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=onetpl.verified.jpg rename to src/Tests/Scrubbing/Scrubbing.ScrubTesting_device=onetpl.verified.webp diff --git a/src/Tests/Scrubbing/Scrubbing.cs b/src/Tests/Scrubbing/Scrubbing.cs index 8317f85..87acfb4 100644 --- a/src/Tests/Scrubbing/Scrubbing.cs +++ b/src/Tests/Scrubbing/Scrubbing.cs @@ -23,6 +23,6 @@ public async Task ScrubTesting([Values] Device device) { var fileStream = File.OpenRead(Path.Combine(path, $"{device}.jpg")); var scrubbed = await Scrubber.Scrub(fileStream, device); - await Verify(scrubbed, extension: "jpg"); + await Verify(scrubbed, extension: "webp"); } } \ No newline at end of file diff --git a/src/Verify.EmailPreviewServices/Devices.cs b/src/Verify.EmailPreviewServices/Devices.cs index a105fc5..d18f640 100644 --- a/src/Verify.EmailPreviewServices/Devices.cs +++ b/src/Verify.EmailPreviewServices/Devices.cs @@ -197,6 +197,22 @@ static Devices() Right = 25, Bottom = 15 }, + [Device.Office365Dark] = new() + { + Top = 250, + BottomTolerance = 10, + Left = 280, + Right = 25, + Bottom = 0 + }, + [Device.Office365Light] = new() + { + Top = 250, + BottomTolerance = 20, + Left = 280, + Right = 25, + Bottom = 0 + }, [Device.Outlook2007] = new() { Top = 191, diff --git a/src/Verify.EmailPreviewServices/Scrubber.cs b/src/Verify.EmailPreviewServices/Scrubber.cs index f3e7f52..299a70e 100644 --- a/src/Verify.EmailPreviewServices/Scrubber.cs +++ b/src/Verify.EmailPreviewServices/Scrubber.cs @@ -22,18 +22,20 @@ public static async Task Scrub(Stream stream, Device device) static void Crop(Image image, ScrubSpec spec) { - if (spec is {Top: 0, Bottom: 0, Left: 0, Right: 0}) + if (spec is { Top: 0, Bottom: 0, Left: 0, Right: 0 }) { return; } - image.Mutate(_ => - _.Crop(new( - spec.Left, - spec.Top, - image.Width - spec.Left - spec.Right, - image.Height - spec.Top - spec.Bottom - ))); + var rectangle = new Rectangle( + spec.Left, + spec.Top, + image.Width - spec.Left - spec.Right, + image.Height - spec.Top - spec.Bottom + ); + var rectangleWidth = rectangle.Left + rectangle.Width; + var rectangleHeight = rectangle.Top + rectangle.Height; + image.Mutate(_ => _.Crop(rectangle)); } static void RemoveBottom(Image image, int? tolerance) @@ -77,13 +79,13 @@ static void RemoveBottom(Image image, int? tolerance) // Crop to content bounds if (bottom < height) { - image.Mutate(_ => - _.Crop(new( - 0, - 0, - image.Width, - bottom - ))); + var rectangle = new Rectangle( + 0, + 0, + image.Width, + bottom + ); + image.Mutate(_ => _.Crop(rectangle)); } }