first pass at generalizing process stubbing

nate smith · nate smith · commit 7555aa9be33e · 2019-10-31T11:29:39.000-05:00
diff --git a/git/git_test.go b/git/git_test.go
@@ -2,62 +2,29 @@ package git
 
 import (
 	"fmt"
+	"github.com/github/gh-cli/test"
 	"os"
-	"os/exec"
 	"testing"
 )
 
-type outputSpec struct {
-	Stdout   string
-	ExitCode int
-}
-
-var _outputs map[string]outputSpec
-
-func init() {
-	_outputs = map[string]outputSpec{
-		"no changes": outputSpec{"", 0},
-		"one change": outputSpec{` M poem.txt
+func TestGitStatusHelperProcess(*testing.T) {
+	if test.SkipTestHelperProcess() {
+		return
+	}
+	outputs := map[string]test.ExecStub{
+		"no changes": test.ExecStub{"", 0},
+		"one change": test.ExecStub{` M poem.txt
 `, 0},
-		"untracked file": outputSpec{` M poem.txt
+		"untracked file": test.ExecStub{` M poem.txt
 ?? new.txt
 `, 0},
-		"boom": outputSpec{"", 1},
-	}
-}
-
-func TestHelperProcess(*testing.T) {
-	if os.Getenv("GO_WANT_HELPER_PROCESS") != "1" {
-		return
+		"boom": test.ExecStub{"", 1},
 	}
-	args := os.Args
-	for len(args) > 0 {
-		if args[0] == "--" {
-			args = args[1:]
-			break
-		}
-		args = args[1:]
-	}
-	output := _outputs[args[0]]
+	output := test.GetExecStub(outputs)
 	defer os.Exit(output.ExitCode)
 	fmt.Println(output.Stdout)
 }
 
-func StubGit(desiredOutput string) func(...string) *exec.Cmd {
-	return func(args ...string) *exec.Cmd {
-		cs := []string{"-test.run=TestHelperProcess", "--", desiredOutput}
-		cs = append(cs, args...)
-		env := []string{
-			"GO_WANT_HELPER_PROCESS=1",
-		}
-
-		cmd := exec.Command(os.Args[0], cs...)
-		cmd.Env = append(env, os.Environ()...)
-		return cmd
-	}
-
-}
-
 func Test_UncommittedChangeCount(t *testing.T) {
 	origGitCommand := GitCommand
 	defer func() {
@@ -71,15 +38,15 @@ func Test_UncommittedChangeCount(t *testing.T) {
 	}
 
 	for k, v := range cases {
-		GitCommand = StubGit(k)
+		GitCommand = test.StubExecCommand("TestGitStatusHelperProcess", k)
 		ucc, _ := UncommittedChangeCount()
 
 		if ucc != v {
 			t.Errorf("got unexpected ucc value: %d for case %s", ucc, k)
 		}
 	}
 
-	GitCommand = StubGit("boom")
+	GitCommand = test.StubExecCommand("TestGitStatusHelperProcess", "boom")
 	_, err := UncommittedChangeCount()
 	if err.Error() != "failed to run git status: exit status 1" {
 		t.Errorf("got unexpected error message: %s", err)
diff --git a/test/helpers.go b/test/helpers.go
@@ -11,6 +11,43 @@ import (
 	"github.com/spf13/cobra"
 )
 
+type ExecStub struct {
+	Stdout   string
+	ExitCode int
+}
+
+func GetExecStub(outputs map[string]ExecStub) ExecStub {
+	args := os.Args
+	for len(args) > 0 {
+		if args[0] == "--" {
+			args = args[1:]
+			break
+		}
+		args = args[1:]
+	}
+	return outputs[args[0]]
+}
+
+func SkipTestHelperProcess() bool {
+	return os.Getenv("GO_WANT_HELPER_PROCESS") != "1"
+}
+
+func StubExecCommand(testHelper string, desiredOutput string) func(...string) *exec.Cmd {
+	return func(args ...string) *exec.Cmd {
+		cs := []string{
+			fmt.Sprintf("-test.run=%s", testHelper),
+			"--", desiredOutput}
+		cs = append(cs, args...)
+		env := []string{
+			"GO_WANT_HELPER_PROCESS=1",
+		}
+
+		cmd := exec.Command(os.Args[0], cs...)
+		cmd.Env = append(env, os.Environ()...)
+		return cmd
+	}
+}
+
 type TempGitRepo struct {
 	Remote   string
 	TearDown func()
