STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use newer command stubbing in tests

Browse source
This commit is contained in:
vilmibm 2021-01-21 12:32:40 -08:00
parent f536901bc1
commit dcedd32249
2 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
git/git_test.go
View file

@ -3,12 +3,10 @@ package git
import (
"os/exec"
"reflect"
"strings"
"testing"
"github.com/cli/cli/internal/run"
"github.com/cli/cli/test"
"github.com/stretchr/testify/assert"
)
func Test_UncommittedChangeCount(t *testing.T) {
@ -199,18 +197,15 @@ func TestAddUpstreamRemote(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
cs, restore := test.InitCmdStubber()
defer restore()
cs, cmdTeardown := run.Stub()
defer cmdTeardown(t)
cs.Stub("") // git remote add -f
cs.Register(tt.want, 0, "")
err := AddUpstreamRemote(tt.upstreamURL, tt.cloneDir, tt.branches)
if err != nil {
t.Fatalf("error running command `git remote add -f`: %v", err)
}
assert.Equal(t, 1, cs.Count)
assert.Equal(t, tt.want, strings.Join(cs.Calls[0].Args, " "))
})
}
}

12
pkg/cmd/repo/clone/clone_test.go
View file

@ -6,6 +6,7 @@ import (
"testing"
"github.com/cli/cli/internal/config"
"github.com/cli/cli/internal/run"
"github.com/cli/cli/pkg/cmdutil"
"github.com/cli/cli/pkg/httpmock"
"github.com/cli/cli/pkg/iostreams"
@ -228,19 +229,16 @@ func Test_RepoClone_hasParent(t *testing.T) {
httpClient := &http.Client{Transport: reg}
cs, restore := test.InitCmdStubber()
defer restore()
cs, cmdTeardown := run.Stub()
defer cmdTeardown(t)
cs.Stub("") // git clone
cs.Stub("") // git remote add
cs.Register(`git clone https://github.com/OWNER/REPO.git`, 0, "")
cs.Register(`git -C REPO remote add -t master -f upstream https://github.com/hubot/ORIG.git`, 0, "")
_, err := runCloneCommand(httpClient, "OWNER/REPO")
if err != nil {
t.Fatalf("error running command `repo clone`: %v", err)
}
assert.Equal(t, 2, cs.Count)
assert.Equal(t, "git -C REPO remote add -t master -f upstream https://github.com/hubot/ORIG.git", strings.Join(cs.Calls[1].Args, " "))
}
func Test_RepoClone_withoutUsername(t *testing.T) {