From e1f44e26545782cd4b97e11c6a12f7bf712530ce Mon Sep 17 00:00:00 2001 From: Andrew Keesler Date: Fri, 24 Jul 2020 11:17:32 -0400 Subject: [PATCH] Condense discovery integration tests I think these tests do roughly the same thing... Signed-off-by: Andrew Keesler --- test/integration/loginrequest_test.go | 43 --------------------------- 1 file changed, 43 deletions(-) diff --git a/test/integration/loginrequest_test.go b/test/integration/loginrequest_test.go index 9799aa14..8305fa34 100644 --- a/test/integration/loginrequest_test.go +++ b/test/integration/loginrequest_test.go @@ -7,7 +7,6 @@ package integration import ( "context" - "encoding/json" "os" "testing" "time" @@ -66,51 +65,9 @@ func TestLoginRequest_ShouldFailWhenRequestDoesNotIncludeToken(t *testing.T) { require.Equal(t, "spec.token.value", cause.Field) } -func TestGetDiscovery(t *testing.T) { - client := library.NewPlaceholderNameClientset(t) - - ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) - defer cancel() - - result, err := client.Discovery().RESTClient().Get().Do(ctx).Raw() - require.NoError(t, err) - - var parsedResult map[string]interface{} - err = json.Unmarshal(result, &parsedResult) - require.NoError(t, err) - require.Contains(t, parsedResult["paths"], "/apis/placeholder.suzerain-io.github.io") - require.Contains(t, parsedResult["paths"], "/apis/placeholder.suzerain-io.github.io/v1alpha1") -} - func TestGetAPIResourceList(t *testing.T) { - var expectedAPIResourceList = `{ - "kind": "APIResourceList", - "apiVersion": "v1", - "groupVersion": "placeholder.suzerain-io.github.io/v1alpha1", - "resources": [ - { - "name": "loginrequests", - "singularName": "", - "namespaced": false, - "kind": "LoginRequest", - "verbs": [ - "create" - ] - } - ] - }` - client := library.NewPlaceholderNameClientset(t) - ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) - defer cancel() - - result, err := client.PlaceholderV1alpha1().RESTClient().Get().Do(ctx).Raw() - require.NoError(t, err) - require.JSONEq(t, expectedAPIResourceList, string(result)) - - // proposed: - groups, resources, err := client.Discovery().ServerGroupsAndResources() require.NoError(t, err)