Trim whitespace from file contents (#186)

* Trim whitespace from file contents

* Update changelog

* Innocuous change

* Revert innocuous change

* Bump counter

Author: glesica

CHANGELOG.md

@@ -2,6 +2,7 @@
 
  - Add `--workdir` flag to change the wokring directory of commander `test` execution 
  - Add `--config` flag to allow configuration to be set in a separate file
+ - Fix bug in `file` matcher
 
 # v2.4.0
 

commander_unix.yaml

@@ -16,7 +16,7 @@ tests:
       contains:
         - ✓ [local] it should exit with error code
         - "- [local] it should skip, was skipped"
-      line-count: 19
+      line-count: 20
     exit-code: 0
 
   it should assert that commander will fail:

integration/unix/_fixtures/file_output_1.txt

@@ -1,3 +1,3 @@
 first line
 second line
-third line
+third line

integration/unix/_fixtures/trailing_newline.txt

@@ -0,0 +1,2 @@
+a
+b

integration/unix/commander_test.yaml

@@ -69,6 +69,11 @@ tests:
     stderr:
       file: ./integration/unix/_fixtures/big_out.txt
 
+  it should handle a trailing newline in the file:
+    command: cat ./integration/unix/_fixtures/trailing_newline.txt
+    stdout:
+      file: ./integration/unix/_fixtures/trailing_newline.txt
+
   it should inherit from parent env:
     config:
       inherit-env: true

pkg/matcher/matcher.go

@@ -269,7 +269,7 @@ func (m FileMatcher) Match(got interface{}, expected interface{}) MatcherResult
 	if err != nil {
 		panic(err.Error())
 	}
-	expectedString := string(expectedText)
+	expectedString := strings.TrimSpace(strings.Replace(string(expectedText), "\r\n", "\n", -1))
 
 	result := got == expectedString