djpbessems
/
ContainerImage.Pinniped
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extract test helper for asserting API errors in rest_test.go 

Signed-off-by: Aram Price <pricear@vmware.com>
This commit is contained in:
Ryan Richard 2020-07-23 09:50:23 -07:00 committed by Aram Price
parent 5fdc20886d
commit 6c87c793db
1 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pkg/registry/loginrequest/rest_test.go
View File

@ -11,9 +11,8 @@ import (
"testing" "testing"
"time" "time"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/authenticator"
@ -78,6 +77,15 @@ func loginRequest(spec placeholderapi.LoginRequestSpec) *placeholderapi.LoginReq
} }
} }
func requireAPIError(t *testing.T, response runtime.Object, err error, expectedErrorTypeChecker func(err error) bool, expectedErrorMessage string) {
t.Helper()
require.Nil(t, response)
require.True(t, expectedErrorTypeChecker(err))
var status apierrors.APIStatus
errors.As(err, &status)
require.Contains(t, status.Status().Message, expectedErrorMessage)
}
func TestCreateSucceedsWhenGivenAToken(t *testing.T) { func TestCreateSucceedsWhenGivenAToken(t *testing.T) {
webhook := FakeToken{} webhook := FakeToken{}
storage := NewREST(&webhook) storage := NewREST(&webhook)
@ -182,11 +190,7 @@ func TestCreateFailsWhenGivenTheWrongInputType(t *testing.T) {
rest.ValidateAllObjectFunc, rest.ValidateAllObjectFunc,
&metav1.CreateOptions{}) &metav1.CreateOptions{})
require.Nil(t, response) requireAPIError(t, response, err, apierrors.IsBadRequest, "not a LoginRequest")
require.True(t, apierrors.IsBadRequest(err))
var status apierrors.APIStatus
errors.As(err, &status)
require.Contains(t, status.Status().Message, "not a LoginRequest")
} }
func TestCreateFailsWhenTokenIsNilInRequest(t *testing.T) { func TestCreateFailsWhenTokenIsNilInRequest(t *testing.T) {
@ -196,13 +200,8 @@ func TestCreateFailsWhenTokenIsNilInRequest(t *testing.T) {
Token: nil, Token: nil,
})) }))
require.Nil(t, response) requireAPIError(t, response, err, apierrors.IsInvalid,
require.True(t, apierrors.IsInvalid(err)) `.placeholder.suzerain-io.github.io "request name" is invalid: spec.token.value: Required value: token must be supplied`)
var status apierrors.APIStatus
errors.As(err, &status)
require.Equal(t,
`.placeholder.suzerain-io.github.io "request name" is invalid: spec.token.value: Required value: token must be supplied`,
status.Status().Message)
} }
func TestCreateFailsWhenTokenValueIsEmptyInRequest(t *testing.T) { func TestCreateFailsWhenTokenValueIsEmptyInRequest(t *testing.T) {
@ -212,13 +211,8 @@ func TestCreateFailsWhenTokenValueIsEmptyInRequest(t *testing.T) {
Token: &placeholderapi.LoginRequestTokenCredential{Value: ""}, Token: &placeholderapi.LoginRequestTokenCredential{Value: ""},
})) }))
require.Nil(t, response) requireAPIError(t, response, err, apierrors.IsInvalid,
require.True(t, apierrors.IsInvalid(err)) `.placeholder.suzerain-io.github.io "request name" is invalid: spec.token.value: Required value: token must be supplied`)
var status apierrors.APIStatus
errors.As(err, &status)
require.Equal(t,
`.placeholder.suzerain-io.github.io "request name" is invalid: spec.token.value: Required value: token must be supplied`,
status.Status().Message)
} }
func TestCreateFailsWhenRequestOptionsDryRunIsNotEmpty(t *testing.T) { func TestCreateFailsWhenRequestOptionsDryRunIsNotEmpty(t *testing.T) {
@ -230,11 +224,6 @@ func TestCreateFailsWhenRequestOptionsDryRunIsNotEmpty(t *testing.T) {
DryRun: []string{"some dry run flag"}, DryRun: []string{"some dry run flag"},
}) })
require.Nil(t, response) requireAPIError(t, response, err, apierrors.IsInvalid,
require.True(t, apierrors.IsInvalid(err)) `.placeholder.suzerain-io.github.io "request name" is invalid: dryRun: Unsupported value: []string{"some dry run flag"}`)
var status apierrors.APIStatus
errors.As(err, &status)
require.Equal(t,
`.placeholder.suzerain-io.github.io "request name" is invalid: dryRun: Unsupported value: []string{"some dry run flag"}`,
status.Status().Message)
} }