mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-07 23:13:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Replace handcrafted genHTTPRequest with httptest.NewRequest

Browse source
This commit is contained in:
Sijmen Schoon 2023-01-27 15:14:57 +01:00 committed by KuhnChris
parent a5f4c5e466
commit 4cca740ecf
1 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
clientapi/auth/login_test.go
View file

@ -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)