summaryrefslogtreecommitdiff
path: root/internal/gitlabnet
diff options
context:
space:
mode:
Diffstat (limited to 'internal/gitlabnet')
-rw-r--r--internal/gitlabnet/discover/client_test.go17
-rw-r--r--internal/gitlabnet/personalaccesstoken/client_test.go15
-rw-r--r--internal/gitlabnet/twofactorrecover/client_test.go15
3 files changed, 22 insertions, 25 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)
})
}
}
diff --git a/internal/gitlabnet/personalaccesstoken/client_test.go b/internal/gitlabnet/personalaccesstoken/client_test.go
index 140a7b2..d9c3f45 100644
--- a/internal/gitlabnet/personalaccesstoken/client_test.go
+++ b/internal/gitlabnet/personalaccesstoken/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"
@@ -93,7 +92,7 @@ func TestGetPersonalAccessTokenByKeyId(t *testing.T) {
result, err := client.GetPersonalAccessToken(
context.Background(), args, "newtoken", &[]string{"read_api", "read_repository"}, "",
)
- assert.NoError(t, err)
+ require.NoError(t, err)
response := &Response{
true,
"aAY1G3YPeemECgUvxuXY",
@@ -101,7 +100,7 @@ func TestGetPersonalAccessTokenByKeyId(t *testing.T) {
"9001-11-17",
"",
}
- assert.Equal(t, response, result)
+ require.Equal(t, response, result)
}
func TestGetRecoveryCodesByUsername(t *testing.T) {
@@ -112,9 +111,9 @@ func TestGetRecoveryCodesByUsername(t *testing.T) {
result, err := client.GetPersonalAccessToken(
context.Background(), args, "newtoken", &[]string{"api"}, "",
)
- assert.NoError(t, err)
+ require.NoError(t, err)
response := &Response{true, "YXuxvUgCEmeePY3G1YAa", []string{"api"}, "", ""}
- assert.Equal(t, response, result)
+ require.Equal(t, response, result)
}
func TestMissingUser(t *testing.T) {
@@ -125,7 +124,7 @@ func TestMissingUser(t *testing.T) {
_, err := client.GetPersonalAccessToken(
context.Background(), args, "newtoken", &[]string{"api"}, "",
)
- assert.Equal(t, "missing user", err.Error())
+ require.Equal(t, "missing user", err.Error())
}
func TestErrorResponses(t *testing.T) {
@@ -161,8 +160,8 @@ func TestErrorResponses(t *testing.T) {
context.Background(), args, "newtoken", &[]string{"api"}, "",
)
- assert.EqualError(t, err, tc.expectedError)
- assert.Nil(t, resp)
+ require.EqualError(t, err, tc.expectedError)
+ require.Nil(t, resp)
})
}
}
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)
})
}
}
View Lorry Controller Status