summaryrefslogtreecommitdiff
path: root/internal/gitlabnet/discover
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/discover
parent3f03127314bd768efd0bef57915320545afcdd78 (diff)
downloadgitlab-shell-zj-remove-testify-assert.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/discover')
-rw-r--r--internal/gitlabnet/discover/client_test.go17
1 files changed, 8 insertions, 9 deletions
diff --git a/internal/gitlabnet/discover/client_test.go b/internal/gitlabnet/discover/client_test.go
index cb46dd7..d1b5039 100644
--- a/internal/gitlabnet/discover/client_test.go
+++ b/internal/gitlabnet/discover/client_test.go
@@ -10,7 +10,6 @@ import (
"gitlab.com/gitlab-org/gitlab-shell/client"
- "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-shell/client/testserver"
"gitlab.com/gitlab-org/gitlab-shell/internal/config"
@@ -64,8 +63,8 @@ func TestGetByKeyId(t *testing.T) {
params := url.Values{}
params.Add("key_id", "1")
result, err := client.getResponse(context.Background(), params)
- assert.NoError(t, err)
- assert.Equal(t, &Response{UserId: 2, Username: "alex-doe", Name: "Alex Doe"}, result)
+ require.NoError(t, err)
+ require.Equal(t, &Response{UserId: 2, Username: "alex-doe", Name: "Alex Doe"}, result)
}
func TestGetByUsername(t *testing.T) {
@@ -75,8 +74,8 @@ func TestGetByUsername(t *testing.T) {
params := url.Values{}
params.Add("username", "jane-doe")
result, err := client.getResponse(context.Background(), params)
- assert.NoError(t, err)
- assert.Equal(t, &Response{UserId: 1, Username: "jane-doe", Name: "Jane Doe"}, result)
+ require.NoError(t, err)
+ require.Equal(t, &Response{UserId: 1, Username: "jane-doe", Name: "Jane Doe"}, result)
}
func TestMissingUser(t *testing.T) {
@@ -86,8 +85,8 @@ func TestMissingUser(t *testing.T) {
params := url.Values{}
params.Add("username", "missing")
result, err := client.getResponse(context.Background(), params)
- assert.NoError(t, err)
- assert.True(t, result.IsAnonymous())
+ require.NoError(t, err)
+ require.True(t, result.IsAnonymous())
}
func TestErrorResponses(t *testing.T) {
@@ -122,8 +121,8 @@ func TestErrorResponses(t *testing.T) {
params.Add("username", tc.fakeUsername)
resp, err := client.getResponse(context.Background(), params)
- assert.EqualError(t, err, tc.expectedError)
- assert.Nil(t, resp)
+ require.EqualError(t, err, tc.expectedError)
+ require.Nil(t, resp)
})
}
}