Text reporter only flattens \r\n, changed to flatten \n too

Jake Ginnivan · Jake Ginnivan · commit 9d1aa5e87826 · 2014-05-02T16:31:00.000+01:00
diff --git a/TestStack.BDDfy.Tests/Reporters/Html/ClassicReportBuilderTests.ShouldProduceExpectedHtmlWithExamples.approved.txt b/TestStack.BDDfy.Tests/Reporters/Html/ClassicReportBuilderTests.ShouldProduceExpectedHtmlWithExamples.approved.txt
@@ -111,7 +111,9 @@ body{margin:0;padding:0;padding-bottom:40px;max-width:100%;background-color:#fff
                           <td>negative</td>
                           <td>is not</td>
                           <td>
-                            <span class='canToggle' data-toggle-target='step-1-19'>Boom</span>
+                            <span class='canToggle' data-toggle-target='step-1-19'>Boom
+With
+New lines</span>
                             <div class='step' id='step-1-19'>
                               <code>   at TestStack.BDDfy.Tests.Reporters.ReportTestData.GetScenarios(Boolean includeFailingScenario, Boolean includeExamples) in ...\ReportTestData.cs:line 113</code>
                             </div>
diff --git a/TestStack.BDDfy.Tests/Reporters/Html/MetroReportBuilderTests.ShouldProduceExpectedHtmlWithExamples.approved.txt b/TestStack.BDDfy.Tests/Reporters/Html/MetroReportBuilderTests.ShouldProduceExpectedHtmlWithExamples.approved.txt
@@ -122,7 +122,9 @@ html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abb
                           <td>negative</td>
                           <td>is not</td>
                           <td>
-                            <span class='canToggle' data-toggle-target='step-1-19'>Boom</span>
+                            <span class='canToggle' data-toggle-target='step-1-19'>Boom
+With
+New lines</span>
                             <div class='step FailedException' id='step-1-19'>
                               <code>   at TestStack.BDDfy.Tests.Reporters.ReportTestData.GetScenarios(Boolean includeFailingScenario, Boolean includeExamples) in ...\ReportTestData.cs:line 113</code>
                             </div>
diff --git a/TestStack.BDDfy.Tests/Reporters/ReportTestData.cs b/TestStack.BDDfy.Tests/Reporters/ReportTestData.cs
@@ -110,7 +110,7 @@ private Scenario[] GetScenarios(bool includeFailingScenario, bool includeExample
                     last.Result = Result.Failed;
                     try
                     {
-                        throw new InvalidOperationException("Boom");
+                        throw new InvalidOperationException("Boom\nWith\r\nNew lines");
                     }
                     catch (Exception ex)
                     {
diff --git a/TestStack.BDDfy.Tests/Reporters/TextReporter/TextReporterTests.ShouldProduceExpectedReport.approved.txt b/TestStack.BDDfy.Tests/Reporters/TextReporter/TextReporterTests.ShouldProduceExpectedReport.approved.txt
@@ -89,12 +89,12 @@ Scenario: Example Scenario
 	Then money <action> dispensed         
 
 Examples: 
-| sign     | action | Result | Errors                                                                                 |
-| positive | is     | Passed |                                                                                        |
-| negative | is not | Failed | Step: Then money <action> dispensed failed with exception: [Boom] [Details at 1 below] |
+| sign     | action | Result | Errors                                                                                                |
+| positive | is     | Passed |                                                                                                       |
+| negative | is not | Failed | Step: Then money <action> dispensed failed with exception: [Boom With New lines] [Details at 1 below] |
 
 Exceptions:
-  1. Boom
+  1. Boom With New lines
    at TestStack.BDDfy.Tests.Reporters.ReportTestData.GetScenarios(Boolean includeFailingScenario, Boolean includeExamples) in ...\ReportTestData.cs
 
 
diff --git a/TestStack.BDDfy/Reporters/TextReporter.cs b/TestStack.BDDfy/Reporters/TextReporter.cs
@@ -211,11 +211,10 @@ void ReportExceptions()
 
         static string FlattenExceptionMessage(string message)
         {
-            return message
+            return string.Join(" ", message
                 .Replace("\t", " ") // replace tab with one space
-                .Replace(Environment.NewLine, ", ") // replace new line with one space
-                .Trim() // trim starting and trailing spaces
-                .Replace("  ", " ")
+                .Split(new[]{"\r\n", "\n"}, StringSplitOptions.None)
+                .Select(s => s.Trim()))
                 .TrimEnd(','); // chop any , from the end
         }
 

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ private Scenario[] GetScenarios(bool includeFailingScenario, bool includeExample`
`110`	`110`	`last.Result = Result.Failed;`
`111`	`111`	`try`
`112`	`112`	`{`
`113`		`- throw new InvalidOperationException("Boom");`
	`113`	`+ throw new InvalidOperationException("Boom\nWith\r\nNew lines");`
`114`	`114`	`}`
`115`	`115`	`catch (Exception ex)`
`116`	`116`	`{`
Original file line number	Diff line number	Diff line change
`@@ -211,11 +211,10 @@ void ReportExceptions()`
`211`	`211`
`212`	`212`	`static string FlattenExceptionMessage(string message)`
`213`	`213`	`{`
`214`		`- return message`
	`214`	`+ return string.Join(" ", message`
`215`	`215`	`.Replace("\t", " ") // replace tab with one space`
`216`		`- .Replace(Environment.NewLine, ", ") // replace new line with one space`
`217`		`- .Trim() // trim starting and trailing spaces`
`218`		`- .Replace(" ", " ")`
	`216`	`+ .Split(new[]{"\r\n", "\n"}, StringSplitOptions.None)`
	`217`	`+ .Select(s => s.Trim()))`
`219`	`218`	`.TrimEnd(','); // chop any , from the end`
`220`	`219`	`}`
`221`	`220`