Fix tests

Bringing in features from #325

integration/context_test.go

@@ -12,9 +12,9 @@ func TestContexts(t *testing.T) {
 			TestDir: "testdata/contexts",
 			Commands: []Command{
 				{
-					Command:        "config get-contexts",
-					ExpectedCode:   0,
-					ExpectedOutput: "get-contexts.txt",
+					Command:            "config get-contexts",
+					ExpectedCode:       0,
+					ExpectedOutputFile: "get-contexts.txt",
 				},
 			},
 		})

integration/dashboard_test.go

@@ -14,9 +14,9 @@ func TestDashboard(t *testing.T) {
 			RunOnContexts: allContexts,
 			Commands: []Command{
 				{
-					Command:        "get Dashboard.ReciqtgGk",
-					ExpectedCode:   0,
-					ExpectedOutput: "ReciqtgGk.json",
+					Command:            "get Dashboard.ReciqtgGk",
+					ExpectedCode:       0,
+					ExpectedOutputFile: "ReciqtgGk.json",
 				},
 			},
 		})

integration/utils_test.go

@@ -18,6 +18,7 @@ type Command struct {
 	ExpectedCode           int
 	ExpectedError          error
 	ExpectedOutput         string
+	ExpectedOutputFile     string
 	ExpectedOutputContains string
 }
 type GrizzlyTest struct {
@@ -46,10 +47,14 @@ func runTest(t *testing.T, test GrizzlyTest) {
 					require.Error(t, err, command.ExpectedError)
 				}
 				require.Equal(t, command.ExpectedCode, exitCode, "Exited with %d (%d expected).\nOutput: %s\nstderr: %s", exitCode, command.ExpectedCode, stdout, stderr)
-				if command.ExpectedOutput != "" {
-					data, err := os.ReadFile(filepath.Join(test.TestDir, command.ExpectedOutput))
+				// Check stdout
+				if command.ExpectedOutputFile != "" {
+					bytes, err := os.ReadFile(filepath.Join(test.TestDir, command.ExpectedOutputFile))
 					require.NoError(t, err)
-					require.Equal(t, string(data), stdout)
+					command.ExpectedOutput = string(bytes)
+				}
+				if command.ExpectedOutput != "" {
+					require.Equal(t, command.ExpectedOutput, stdout)
 				}
 				if command.ExpectedOutputContains != "" {
 					require.Contains(t, stdout, command.ExpectedOutputContains)