Skip to content

Commit 2eed159

Browse files
committed
use Stub instead of SetPrepareCmd in 'pr list' tests
1 parent 877cbbb commit 2eed159

File tree

1 file changed

+7
-16
lines changed

1 file changed

+7
-16
lines changed

pkg/cmd/pr/list/list_test.go

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"bytes"
55
"io/ioutil"
66
"net/http"
7-
"os/exec"
87
"strings"
98
"testing"
109

@@ -72,7 +71,7 @@ func TestPRList(t *testing.T) {
7271
assert.Equal(t, heredoc.Doc(`
7372
7473
Showing 3 of 3 open pull requests in OWNER/REPO
75-
74+
7675
#32 New feature feature
7776
#29 Fixed bad bug hubot:bug-fix
7877
#28 Improve documentation docs
@@ -199,27 +198,19 @@ func TestPRList_web(t *testing.T) {
199198
http := initFakeHTTP()
200199
defer http.Verify(t)
201200

202-
var seenCmd *exec.Cmd
203-
//nolint:staticcheck // SA1019 TODO: rewrite to use run.Stub
204-
restoreCmd := run.SetPrepareCmd(func(cmd *exec.Cmd) run.Runnable {
205-
seenCmd = cmd
206-
return &test.OutputStub{}
201+
cs, cmdTeardown := run.Stub()
202+
defer cmdTeardown(t)
203+
204+
cs.Register(`https://github\.com`, 0, "", func(args []string) {
205+
url := strings.ReplaceAll(args[len(args)-1], "^", "")
206+
assert.Equal(t, "https://github.com/OWNER/REPO/pulls?q=is%3Apr+is%3Amerged+assignee%3Apeter+label%3Abug+label%3Adocs+base%3Atrunk", url)
207207
})
208-
defer restoreCmd()
209208

210209
output, err := runCommand(http, true, "--web -a peter -l bug -l docs -L 10 -s merged -B trunk")
211210
if err != nil {
212211
t.Errorf("error running command `pr list` with `--web` flag: %v", err)
213212
}
214213

215-
expectedURL := "https://github.com/OWNER/REPO/pulls?q=is%3Apr+is%3Amerged+assignee%3Apeter+label%3Abug+label%3Adocs+base%3Atrunk"
216-
217214
assert.Equal(t, "", output.String())
218215
assert.Equal(t, "Opening github.com/OWNER/REPO/pulls in your browser.\n", output.Stderr())
219-
220-
if seenCmd == nil {
221-
t.Fatal("expected a command to run")
222-
}
223-
url := seenCmd.Args[len(seenCmd.Args)-1]
224-
assert.Equal(t, url, expectedURL)
225216
}

0 commit comments

Comments
 (0)