diff --git a/pkg/cmd/project/link/link_test.go b/pkg/cmd/project/link/link_test.go index 0d6d13895..fa3611353 100644 --- a/pkg/cmd/project/link/link_test.go +++ b/pkg/cmd/project/link/link_test.go @@ -7,7 +7,7 @@ import ( "github.com/cli/cli/v2/pkg/cmdutil" "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" - "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "gopkg.in/h2non/gock.v1" "net/http" "testing" @@ -95,7 +95,7 @@ func TestNewCmdLink(t *testing.T) { } argv, err := shlex.Split(tt.cli) - assert.NoError(t, err) + require.NoError(t, err) var gotOpts linkOpts cmd := NewCmdLink(f, func(config linkConfig) error { @@ -106,19 +106,19 @@ func TestNewCmdLink(t *testing.T) { cmd.SetArgs(argv) _, err = cmd.ExecuteC() if tt.wantsErr { - assert.Error(t, err) - assert.Equal(t, tt.wantsErrMsg, err.Error()) + require.Error(t, err) + require.Equal(t, tt.wantsErrMsg, err.Error()) return } - assert.NoError(t, err) + require.NoError(t, err) - assert.Equal(t, tt.wants.number, gotOpts.number) - assert.Equal(t, tt.wants.owner, gotOpts.owner) - assert.Equal(t, tt.wants.repo, gotOpts.repo) - assert.Equal(t, tt.wants.team, gotOpts.team) - assert.Equal(t, tt.wants.projectID, gotOpts.projectID) - assert.Equal(t, tt.wants.repoID, gotOpts.repoID) - assert.Equal(t, tt.wants.teamID, gotOpts.teamID) + require.Equal(t, tt.wants.number, gotOpts.number) + require.Equal(t, tt.wants.owner, gotOpts.owner) + require.Equal(t, tt.wants.repo, gotOpts.repo) + require.Equal(t, tt.wants.team, gotOpts.team) + require.Equal(t, tt.wants.projectID, gotOpts.projectID) + require.Equal(t, tt.wants.repoID, gotOpts.repoID) + require.Equal(t, tt.wants.teamID, gotOpts.teamID) }) } } @@ -226,8 +226,8 @@ func TestRunLink_Repo(t *testing.T) { } err := runLink(cfg) - assert.NoError(t, err) - assert.Equal( + require.NoError(t, err) + require.Equal( t, "Linked 'monalisa/my-repo' to project #1 'first-project'\n", stdout.String()) @@ -338,8 +338,8 @@ func TestRunLink_Team(t *testing.T) { } err := runLink(cfg) - assert.NoError(t, err) - assert.Equal( + require.NoError(t, err) + require.Equal( t, "Linked 'monalisa-org/my-team' to project #1 'first-project'\n", stdout.String()) diff --git a/pkg/cmd/project/unlink/unlink_test.go b/pkg/cmd/project/unlink/unlink_test.go index 4d70637f3..a1cc13aa4 100644 --- a/pkg/cmd/project/unlink/unlink_test.go +++ b/pkg/cmd/project/unlink/unlink_test.go @@ -7,7 +7,7 @@ import ( "github.com/cli/cli/v2/pkg/cmdutil" "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" - "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "gopkg.in/h2non/gock.v1" "net/http" "testing" @@ -95,7 +95,7 @@ func TestNewCmdUnlink(t *testing.T) { } argv, err := shlex.Split(tt.cli) - assert.NoError(t, err) + require.NoError(t, err) var gotOpts unlinkOpts cmd := NewCmdUnlink(f, func(config unlinkConfig) error { @@ -106,19 +106,19 @@ func TestNewCmdUnlink(t *testing.T) { cmd.SetArgs(argv) _, err = cmd.ExecuteC() if tt.wantsErr { - assert.Error(t, err) - assert.Equal(t, tt.wantsErrMsg, err.Error()) + require.Error(t, err) + require.Equal(t, tt.wantsErrMsg, err.Error()) return } - assert.NoError(t, err) + require.NoError(t, err) - assert.Equal(t, tt.wants.number, gotOpts.number) - assert.Equal(t, tt.wants.owner, gotOpts.owner) - assert.Equal(t, tt.wants.repo, gotOpts.repo) - assert.Equal(t, tt.wants.team, gotOpts.team) - assert.Equal(t, tt.wants.projectID, gotOpts.projectID) - assert.Equal(t, tt.wants.repoID, gotOpts.repoID) - assert.Equal(t, tt.wants.teamID, gotOpts.teamID) + require.Equal(t, tt.wants.number, gotOpts.number) + require.Equal(t, tt.wants.owner, gotOpts.owner) + require.Equal(t, tt.wants.repo, gotOpts.repo) + require.Equal(t, tt.wants.team, gotOpts.team) + require.Equal(t, tt.wants.projectID, gotOpts.projectID) + require.Equal(t, tt.wants.repoID, gotOpts.repoID) + require.Equal(t, tt.wants.teamID, gotOpts.teamID) }) } } @@ -226,8 +226,8 @@ func TestRunUnlink_Repo(t *testing.T) { } err := runUnlink(cfg) - assert.NoError(t, err) - assert.Equal( + require.NoError(t, err) + require.Equal( t, "Unlinked 'monalisa/my-repo' from project #1 'first-project'\n", stdout.String()) @@ -338,8 +338,8 @@ func TestRunUnlink_Team(t *testing.T) { } err := runUnlink(cfg) - assert.NoError(t, err) - assert.Equal( + require.NoError(t, err) + require.Equal( t, "Unlinked 'monalisa-org/my-team' from project #1 'first-project'\n", stdout.String())