add StubError to CmdStubber

vilmibm · vilmibm · commit dd1e2a2dfc0a · 2020-03-24T14:19:35.000-05:00
diff --git a/command/pr_checkout_test.go b/command/pr_checkout_test.go
@@ -350,7 +350,7 @@ func TestPRCheckout_differentRepo_existingBranch(t *testing.T) {
 	restoreCmd := run.SetPrepareCmd(func(cmd *exec.Cmd) run.Runnable {
 		switch strings.Join(cmd.Args, " ") {
 		case "git config branch.feature.merge":
-			return &test.OutputStub{[]byte("refs/heads/feature\n")}
+			return &test.OutputStub{[]byte("refs/heads/feature\n"), nil}
 		default:
 			ranCommands = append(ranCommands, cmd.Args)
 			return &test.OutputStub{}
@@ -400,7 +400,7 @@ func TestPRCheckout_differentRepo_currentBranch(t *testing.T) {
 	restoreCmd := run.SetPrepareCmd(func(cmd *exec.Cmd) run.Runnable {
 		switch strings.Join(cmd.Args, " ") {
 		case "git config branch.feature.merge":
-			return &test.OutputStub{[]byte("refs/heads/feature\n")}
+			return &test.OutputStub{[]byte("refs/heads/feature\n"), nil}
 		default:
 			ranCommands = append(ranCommands, cmd.Args)
 			return &test.OutputStub{}
diff --git a/command/pr_test.go b/command/pr_test.go
@@ -112,7 +112,7 @@ func TestPRStatus_fork(t *testing.T) {
 		switch strings.Join(cmd.Args, " ") {
 		case `git config --get-regexp ^branch\.blueberries\.(remote|merge)$`:
 			return &test.OutputStub{[]byte(`branch.blueberries.remote origin
-branch.blueberries.merge refs/heads/blueberries`)}
+branch.blueberries.merge refs/heads/blueberries`), nil}
 		default:
 			panic("not implemented")
 		}
diff --git a/git/git_test.go b/git/git_test.go
@@ -27,7 +27,7 @@ func Test_UncommittedChangeCount(t *testing.T) {
 
 	for _, v := range cases {
 		_ = run.SetPrepareCmd(func(*exec.Cmd) run.Runnable {
-			return &test.OutputStub{[]byte(v.Output)}
+			return &test.OutputStub{[]byte(v.Output), nil}
 		})
 		ucc, _ := UncommittedChangeCount()
 
diff --git a/test/helpers.go b/test/helpers.go
@@ -1,6 +1,7 @@
 package test
 
 import (
+	"errors"
 	"fmt"
 	"os/exec"
 
@@ -9,14 +10,21 @@ import (
 
 // OutputStub implements a simple utils.Runnable
 type OutputStub struct {
-	Out []byte
+	Out   []byte
+	Error error
 }
 
 func (s OutputStub) Output() ([]byte, error) {
+	if s.Error != nil {
+		return s.Out, s.Error
+	}
 	return s.Out, nil
 }
 
 func (s OutputStub) Run() error {
+	if s.Error != nil {
+		return s.Error
+	}
 	return nil
 }
 
@@ -34,7 +42,12 @@ func InitCmdStubber() (*CmdStubber, func()) {
 
 func (cs *CmdStubber) Stub(desiredOutput string) {
 	// TODO maybe have some kind of command mapping but going simple for now
-	cs.Stubs = append(cs.Stubs, &OutputStub{[]byte(desiredOutput)})
+	cs.Stubs = append(cs.Stubs, &OutputStub{[]byte(desiredOutput), nil})
+}
+
+func (cs *CmdStubber) StubError(msg string) {
+	// TODO consider handling CmdErr instead of a raw error
+	cs.Stubs = append(cs.Stubs, &OutputStub{[]byte{}, errors.New(msg)})
 }
 
 func createStubbedPrepareCmd(cs *CmdStubber) func(*exec.Cmd) run.Runnable {

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ func TestPRStatus_fork(t *testing.T) {`
`112`	`112`	`switch strings.Join(cmd.Args, " ") {`
`113`	`113`	case `git config --get-regexp ^branch\.blueberries\.(remote\|merge)$`:
`114`	`114`	return &test.OutputStub{[]byte(`branch.blueberries.remote origin
`115`		-branch.blueberries.merge refs/heads/blueberries`)}
	`115`	+branch.blueberries.merge refs/heads/blueberries`), nil}
`116`	`116`	`default:`
`117`	`117`	`panic("not implemented")`
`118`	`118`	`}`