From f1b97bdd24eca6c533c0ce34daae1517a16d6420 Mon Sep 17 00:00:00 2001
From: Tommy Bidne <tbidne@protonmail.com>
Date: Tue, 12 Mar 2024 10:28:58 +1300
Subject: [PATCH] Trim stderr strings before concat

---
 src/Shrun/IO/Types.hs                       | 2 +-
 test/functional/Functional/Miscellaneous.hs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Shrun/IO/Types.hs b/src/Shrun/IO/Types.hs
index fa4cd411..c92925d5 100644
--- a/src/Shrun/IO/Types.hs
+++ b/src/Shrun/IO/Types.hs
@@ -56,7 +56,7 @@ readHandleResultToStderr :: ReadHandleResult -> Stderr
 readHandleResultToStderr ReadNoData = MkStderr "<No data>"
 readHandleResultToStderr (ReadErr err) = MkStderr err
 readHandleResultToStderr (ReadSuccess errLines) =
-  MkStderr (T.intercalate " " errLines)
+  MkStderr (T.intercalate " " $ fmap T.strip errLines)
 
 -- | Attempts to read from the handle.
 readHandle ::
diff --git a/test/functional/Functional/Miscellaneous.hs b/test/functional/Functional/Miscellaneous.hs
index e133317c..843d4811 100644
--- a/test/functional/Functional/Miscellaneous.hs
+++ b/test/functional/Functional/Miscellaneous.hs
@@ -45,14 +45,14 @@ spaceStderrLogs = testCase "Stderr Log with newlines is spaced" $ do
     args =
       withNoConfig
         [ "--cmd-log",
-          "sleep 1 && echo -e 'abc\ndef' && exit 1"
+          "sleep 1 && echo -e 'abc\n  def' && exit 1"
         ]
 
     -- verifying final 'abc\ndef' log is translated to 'abc def' in the final
     -- stderr msg
     expected =
-      [ withErrorPrefix "sleep 1 && echo -e 'abc def' && exit 1" <> "1 second: abc def"
+      [ withErrorPrefix "sleep 1 && echo -e 'abc   def' && exit 1" <> "1 second: abc def"
       ]
     unexpected =
-      [ withErrorPrefix "sleep 1 && echo -e 'abc def' && exit 1" <> "1 second: abcdef"
+      [ withErrorPrefix "sleep 1 && echo -e 'abc   def' && exit 1" <> "1 second: abcdef"
       ]