From 17a431321cfc2c868c7bf07b55e1b48bd2963a5a Mon Sep 17 00:00:00 2001 From: TwiN Date: Thu, 11 Nov 2021 00:14:00 -0500 Subject: [PATCH] Pass http.NoBody instead of nil as body --- controller/controller_test.go | 2 +- controller/handler/badge_test.go | 2 +- controller/handler/chart_test.go | 2 +- controller/handler/endpoint_status_test.go | 4 ++-- controller/handler/favicon_test.go | 2 +- controller/handler/handler_test.go | 2 +- controller/handler/spa_test.go | 2 +- controller/handler/util_test.go | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/controller/controller_test.go b/controller/controller_test.go index 52c9f070..865dfc5e 100644 --- a/controller/controller_test.go +++ b/controller/controller_test.go @@ -34,7 +34,7 @@ func TestHandle(t *testing.T) { defer os.Clearenv() Handle(cfg.Security, cfg.Web, cfg.UI, cfg.Metrics) defer Shutdown() - request, _ := http.NewRequest("GET", "/health", nil) + request, _ := http.NewRequest("GET", "/health", http.NoBody) responseRecorder := httptest.NewRecorder() server.Handler.ServeHTTP(responseRecorder, request) if responseRecorder.Code != http.StatusOK { diff --git a/controller/handler/badge_test.go b/controller/handler/badge_test.go index 1f16f5ac..e74bc583 100644 --- a/controller/handler/badge_test.go +++ b/controller/handler/badge_test.go @@ -107,7 +107,7 @@ func TestUptimeBadge(t *testing.T) { } for _, scenario := range scenarios { t.Run(scenario.Name, func(t *testing.T) { - request, _ := http.NewRequest("GET", scenario.Path, nil) + request, _ := http.NewRequest("GET", scenario.Path, http.NoBody) if scenario.Gzip { request.Header.Set("Accept-Encoding", "gzip") } diff --git a/controller/handler/chart_test.go b/controller/handler/chart_test.go index dd950f18..f441ad0c 100644 --- a/controller/handler/chart_test.go +++ b/controller/handler/chart_test.go @@ -66,7 +66,7 @@ func TestResponseTimeChart(t *testing.T) { } for _, scenario := range scenarios { t.Run(scenario.Name, func(t *testing.T) { - request, _ := http.NewRequest("GET", scenario.Path, nil) + request, _ := http.NewRequest("GET", scenario.Path, http.NoBody) if scenario.Gzip { request.Header.Set("Accept-Encoding", "gzip") } diff --git a/controller/handler/endpoint_status_test.go b/controller/handler/endpoint_status_test.go index f8b88d30..8e8bc4e7 100644 --- a/controller/handler/endpoint_status_test.go +++ b/controller/handler/endpoint_status_test.go @@ -139,7 +139,7 @@ func TestEndpointStatus(t *testing.T) { } for _, scenario := range scenarios { t.Run(scenario.Name, func(t *testing.T) { - request, _ := http.NewRequest("GET", scenario.Path, nil) + request, _ := http.NewRequest("GET", scenario.Path, http.NoBody) if scenario.Gzip { request.Header.Set("Accept-Encoding", "gzip") } @@ -211,7 +211,7 @@ func TestEndpointStatuses(t *testing.T) { for _, scenario := range scenarios { t.Run(scenario.Name, func(t *testing.T) { - request, _ := http.NewRequest("GET", scenario.Path, nil) + request, _ := http.NewRequest("GET", scenario.Path, http.NoBody) responseRecorder := httptest.NewRecorder() router.ServeHTTP(responseRecorder, request) if responseRecorder.Code != scenario.ExpectedCode { diff --git a/controller/handler/favicon_test.go b/controller/handler/favicon_test.go index 2fc16259..581a2dbd 100644 --- a/controller/handler/favicon_test.go +++ b/controller/handler/favicon_test.go @@ -22,7 +22,7 @@ func TestFavIcon(t *testing.T) { } for _, scenario := range scenarios { t.Run(scenario.Name, func(t *testing.T) { - request, _ := http.NewRequest("GET", scenario.Path, nil) + request, _ := http.NewRequest("GET", scenario.Path, http.NoBody) responseRecorder := httptest.NewRecorder() router.ServeHTTP(responseRecorder, request) if responseRecorder.Code != scenario.ExpectedCode { diff --git a/controller/handler/handler_test.go b/controller/handler/handler_test.go index 207f8285..132a601a 100644 --- a/controller/handler/handler_test.go +++ b/controller/handler/handler_test.go @@ -44,7 +44,7 @@ func TestCreateRouter(t *testing.T) { } for _, scenario := range scenarios { t.Run(scenario.Name, func(t *testing.T) { - request, _ := http.NewRequest("GET", scenario.Path, nil) + request, _ := http.NewRequest("GET", scenario.Path, http.NoBody) if scenario.Gzip { request.Header.Set("Accept-Encoding", "gzip") } diff --git a/controller/handler/spa_test.go b/controller/handler/spa_test.go index 19142ddb..20838f7e 100644 --- a/controller/handler/spa_test.go +++ b/controller/handler/spa_test.go @@ -56,7 +56,7 @@ func TestSinglePageApplication(t *testing.T) { } for _, scenario := range scenarios { t.Run(scenario.Name, func(t *testing.T) { - request, _ := http.NewRequest("GET", scenario.Path, nil) + request, _ := http.NewRequest("GET", scenario.Path, http.NoBody) if scenario.Gzip { request.Header.Set("Accept-Encoding", "gzip") } diff --git a/controller/handler/util_test.go b/controller/handler/util_test.go index 1648d148..c91b72e1 100644 --- a/controller/handler/util_test.go +++ b/controller/handler/util_test.go @@ -54,7 +54,7 @@ func TestExtractPageAndPageSizeFromRequest(t *testing.T) { } for _, scenario := range scenarios { t.Run("page-"+scenario.Page+"-pageSize-"+scenario.PageSize, func(t *testing.T) { - request, _ := http.NewRequest("GET", fmt.Sprintf("/api/v1/statuses?page=%s&pageSize=%s", scenario.Page, scenario.PageSize), nil) + request, _ := http.NewRequest("GET", fmt.Sprintf("/api/v1/statuses?page=%s&pageSize=%s", scenario.Page, scenario.PageSize), http.NoBody) actualPage, actualPageSize := extractPageAndPageSizeFromRequest(request) if actualPage != scenario.ExpectedPage { t.Errorf("expected %d, got %d", scenario.ExpectedPage, actualPage)