Fix windows tests

Author: SimonBaeumer

pkg/app/test_command_test.go

@@ -10,7 +10,7 @@ func Test_TestCommand(t *testing.T) {
 	err := TestCommand("commander.yaml", "", AddCommandContext{})
 
 	if runtime.GOOS == "windows" {
-		assert.Equal(t, "Error open commander.yaml: The system cannot find the file specified.", err.Error())
+		assert.Contains(t, err.Error(), "Error open commander.yaml:")
 	} else {
 		assert.Equal(t, "Error open commander.yaml: no such file or directory", err.Error())
 	}
@@ -20,7 +20,7 @@ func Test_TestCommand_ShouldUseCustomFile(t *testing.T) {
 	err := TestCommand("my-test.yaml", "", AddCommandContext{})
 
 	if runtime.GOOS == "windows" {
-		assert.Equal(t, "Error open my-test.yaml: The system cannot find the file specified.", err.Error())
+		assert.Contains(t, err.Error(), "Error open my-test.yaml: ")
 	} else {
 		assert.Equal(t, "Error open my-test.yaml: no such file or directory", err.Error())
 	}

pkg/runtime/runtime.go

@@ -195,17 +195,26 @@ func runTest(test TestCase) TestResult {
 	// Write test result
 	test.Result = CommandResult{
 		ExitCode: cut.ExitCode(),
-		Stdout:   strings.TrimSpace(cut.Stdout()),
-		Stderr:   strings.TrimSpace(cut.Stderr()),
+		Stdout:   strings.TrimSpace(strings.Replace(cut.Stdout(), "\r\n", "\n", -1)),
+		Stderr:   strings.TrimSpace(strings.Replace(cut.Stderr(), "\r\n", "\n", -1)),
 	}
 
-	log.Println("title: '"+test.Title+"'", " ExitCode: ", test.Result.ExitCode)
-	log.Println("title: '"+test.Title+"'", " Stdout: ", test.Result.Stdout)
-	log.Println("title: '"+test.Title+"'", " Stderr: ", test.Result.Stderr)
+	log.Println("title: '" + test.Title + "'", " ExitCode: ", test.Result.ExitCode)
+	log.Println("title: '" + test.Title + "'", " Stdout: ", test.Result.Stdout)
+	log.Println("title: '" + test.Title + "'", " Stderr: ", test.Result.Stderr)
 
 	return Validate(test)
 }
 
+// trimSpace implementation to trim CLRF off
+func trimSpace(s string) string {
+	result := strings.TrimSpace(s)
+	if runtime.GOOS == "windows" {
+		return strings.Trim(s, "\r\n")
+	}
+	return result
+}
+
 func createEnvVarsOption(test TestCase) func(c *cmd.Command) {
 	return func(c *cmd.Command) {
 		// Add all env variables from parent process

pkg/runtime/runtime_test.go

@@ -99,7 +99,7 @@ func Test_runTestShouldReturnError(t *testing.T) {
 	got := runTest(test)
 
 	if runtime.GOOS == "windows" {
-		assert.Contains(t, got.TestCase.Result.Error.Error(), "chdir /home/invalid: The system cannot find the path specified.")
+		assert.Contains(t, got.TestCase.Result.Error.Error(), "chdir /home/invalid")
 	} else {
 		assert.Equal(t, "chdir /home/invalid: no such file or directory", got.TestCase.Result.Error.Error())
 	}