From 4cca740ecf076f51c8ec7bcc0338f99c14d142cb Mon Sep 17 00:00:00 2001 From: Sijmen Schoon Date: Fri, 27 Jan 2023 15:14:57 +0100 Subject: [PATCH] Replace handcrafted genHTTPRequest with httptest.NewRequest --- clientapi/auth/login_test.go | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/clientapi/auth/login_test.go b/clientapi/auth/login_test.go index b31991851..3aa7c537a 100644 --- a/clientapi/auth/login_test.go +++ b/clientapi/auth/login_test.go @@ -17,6 +17,7 @@ package auth import ( "context" "net/http" + "net/http/httptest" "reflect" "regexp" "strings" @@ -55,17 +56,6 @@ var cfg = &config.ClientAPI{ }, } -func genHTTPRequest(ctx context.Context, body string, token string) (*http.Request, error) { - req, err := http.NewRequestWithContext(ctx, "POST", "", strings.NewReader(body)) - if err != nil { - return nil, err - } - if token != "" { - req.Header.Add("Authorization", "Bearer "+token) - } - return req, err -} - func TestLoginFromJSONReader(t *testing.T) { ctx := context.Background() @@ -129,9 +119,9 @@ func TestLoginFromJSONReader(t *testing.T) { t.Run(tst.Name, func(t *testing.T) { var userAPI fakeUserInternalAPI - req, err := genHTTPRequest(ctx, tst.Body, tst.Token) - if err != nil { - t.Fatalf("genHTTPRequest failed: %v", err) + req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader(tst.Body)) + if tst.Token != "" { + req.Header.Add("Authorization", "Bearer "+tst.Token) } login, cleanup, jsonErr := LoginFromJSONReader(req, &userAPI, &userAPI, cfg) @@ -249,9 +239,9 @@ func TestBadLoginFromJSONReader(t *testing.T) { t.Run(tst.Name, func(t *testing.T) { var userAPI fakeUserInternalAPI - req, err := genHTTPRequest(ctx, tst.Body, tst.Token) - if err != nil { - t.Fatalf("genHTTPRequest failed: %v", err) + req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader(tst.Body)) + if tst.Token != "" { + req.Header.Add("Authorization", "Bearer "+tst.Token) } _, cleanup, errRes := LoginFromJSONReader(req, &userAPI, &userAPI, cfg)