- Fix failing integration test by normalizing NewLine in output comparison.

Author: nairdo

Rock.Tests.Integration/Core/Lava/Engine/LavaCommentsTests.cs

@@ -396,7 +396,7 @@ public void ShorthandLineComment_WithLeadingWhiteSpace_RendersLineWithWhiteSpace
             var input = "Line 1\n   //-\nLine 2";
             var expectedOutput = "Line 1\n   \nLine 2";
 
-            var renderOptions = new LavaTestRenderOptions { IgnoreWhiteSpace = false };
+            var renderOptions = new LavaTestRenderOptions { IgnoreWhiteSpace = false, NormalizeNewLine = true };
             var result = TestHelper.GetTemplateRenderResult( typeof( FluidEngine ), input, options: renderOptions );
 
             TestHelper.AssertTemplateOutput( typeof( FluidEngine ), expectedOutput, input, options: renderOptions );

Rock.Tests.Shared/Lava/LavaIntegrationTestHelper.cs

@@ -756,6 +756,11 @@ public void AssertTemplateOutput( ILavaEngine engine, IEnumerable<LavaTestOutput
                     outputCompareText = Regex.Replace( outputCompareText, @"\s*", string.Empty );
                 }
 
+                if ( options.NormalizeNewLine )
+                {
+                    outputCompareText = Regex.Replace( outputCompareText, @"\r\n", "\n" );
+                }
+
                 if ( options.IgnoreCase )
                 {
                     outputCompareText = outputCompareText.ToLower();

Rock.Tests.Shared/Lava/LavaTestRenderOptions.cs

@@ -93,6 +93,10 @@ public static LavaTestRenderOptions New
 
         public bool IgnoreWhiteSpace = true;
         public bool IgnoreCase = false;
+        /// <summary>
+        /// When enabled, newline differences (CRLF vs LF) will be normalized (into LF which is \n) before comparison.
+        /// </summary>
+        public bool NormalizeNewLine = false;
 
         public List<string> Wildcards = new List<string>();