summaryrefslogtreecommitdiff
path: root/internal/gitlabnet/twofactorrecover/client_test.go
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2020-10-15 08:44:05 +0200
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2020-10-15 08:44:05 +0200
commit308948b3838c88621e738762241e8d1980881a17 (patch)
tree0cef7c4eb067c2320167634850598bd7d96cc953 /internal/gitlabnet/twofactorrecover/client_test.go
parent3f03127314bd768efd0bef57915320545afcdd78 (diff)
downloadgitlab-shell-308948b3838c88621e738762241e8d1980881a17.tar.gz
tests: Replace assert with requirezj-remove-testify-assert
Testify features sub packages `assert` and `require`. The difference is subtle, and lost on novice Golang developers that don't read the docs. To create a more consistent code base `assert` will no longer be used. This change was generated by a running a sed command on all `_test.go` files, followed by `goimports -w`.
Diffstat (limited to 'internal/gitlabnet/twofactorrecover/client_test.go')
-rw-r--r--internal/gitlabnet/twofactorrecover/client_test.go15
1 files changed, 7 insertions, 8 deletions
diff --git a/internal/gitlabnet/twofactorrecover/client_test.go b/internal/gitlabnet/twofactorrecover/client_test.go
index 46291aa..55656a8 100644
--- a/internal/gitlabnet/twofactorrecover/client_test.go
+++ b/internal/gitlabnet/twofactorrecover/client_test.go
@@ -7,7 +7,6 @@ import (
"net/http"
"testing"
- "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-shell/client"
"gitlab.com/gitlab-org/gitlab-shell/client/testserver"
@@ -87,8 +86,8 @@ func TestGetRecoveryCodesByKeyId(t *testing.T) {
args := &commandargs.Shell{GitlabKeyId: "0"}
result, err := client.GetRecoveryCodes(context.Background(), args)
- assert.NoError(t, err)
- assert.Equal(t, []string{"recovery 1", "codes 1"}, result)
+ require.NoError(t, err)
+ require.Equal(t, []string{"recovery 1", "codes 1"}, result)
}
func TestGetRecoveryCodesByUsername(t *testing.T) {
@@ -97,8 +96,8 @@ func TestGetRecoveryCodesByUsername(t *testing.T) {
args := &commandargs.Shell{GitlabUsername: "jane-doe"}
result, err := client.GetRecoveryCodes(context.Background(), args)
- assert.NoError(t, err)
- assert.Equal(t, []string{"recovery 2", "codes 2"}, result)
+ require.NoError(t, err)
+ require.Equal(t, []string{"recovery 2", "codes 2"}, result)
}
func TestMissingUser(t *testing.T) {
@@ -107,7 +106,7 @@ func TestMissingUser(t *testing.T) {
args := &commandargs.Shell{GitlabKeyId: "1"}
_, err := client.GetRecoveryCodes(context.Background(), args)
- assert.Equal(t, "missing user", err.Error())
+ require.Equal(t, "missing user", err.Error())
}
func TestErrorResponses(t *testing.T) {
@@ -141,8 +140,8 @@ func TestErrorResponses(t *testing.T) {
args := &commandargs.Shell{GitlabKeyId: tc.fakeId}
resp, err := client.GetRecoveryCodes(context.Background(), args)
- assert.EqualError(t, err, tc.expectedError)
- assert.Nil(t, resp)
+ require.EqualError(t, err, tc.expectedError)
+ require.Nil(t, resp)
})
}
}