Merge pull request #9 from omc/chore/update-test-handlefuncs

Chore/update test handlefuncs
omc · May 3, 2024 · 96850a6 · 96850a6
2 parents 7372fc0 + 81908a0
commit 96850a6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/bonsai/client_impl_test.go b/bonsai/client_impl_test.go
@@ -9,6 +9,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"github.com/go-chi/chi/v5"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 	"golang.org/x/time/rate"
@@ -25,7 +26,7 @@ type ClientImplTestSuite struct {
 	suite.Suite
 
 	// serveMux is the request multiplexer used for tests
-	serveMux *http.ServeMux
+	serveMux *chi.Mux
 	// server is the testing server on some local port
 	server *httptest.Server
 	// client allows each test to have a reachable *Client for testing
@@ -34,7 +35,7 @@ type ClientImplTestSuite struct {
 
 func (s *ClientImplTestSuite) SetupSuite() {
 	// Configure http client and other miscellany
-	s.serveMux = http.NewServeMux()
+	s.serveMux = chi.NewRouter()
 	s.server = httptest.NewServer(s.serveMux)
 	token, err := NewToken("TestToken")
 	if err != nil {
@@ -90,7 +91,7 @@ func (s *ClientImplTestSuite) TestClientAll() {
 		expectedPage = 1
 	)
 
-	s.serveMux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+	s.serveMux.Get("/", func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set(HTTPHeaderContentType, HTTPContentTypeJSON)
 
 		respBody, _ := NewResponse()

diff --git a/bonsai/client_test.go b/bonsai/client_test.go
@@ -99,7 +99,7 @@ func (s *ClientTestSuite) TestClientResponseError() {
 	const p = "/clusters/doesnotexist-1234"
 
 	// Configure Servemux to serve the error response at this path
-	s.serveMux.HandleFunc(p, func(w http.ResponseWriter, _ *http.Request) {
+	s.serveMux.Get(p, func(w http.ResponseWriter, _ *http.Request) {
 		var err error
 
 		w.Header().Set("Content-Type", bonsai.HTTPContentTypeJSON)
@@ -125,11 +125,8 @@ func (s *ClientTestSuite) TestClientResponseError() {
 }
 
 func (s *ClientTestSuite) TestClientResponseWithPagination() {
-	s.serveMux.HandleFunc("/clusters", func(w http.ResponseWriter, _ *http.Request) {
+	s.serveMux.Get("/clusters", func(w http.ResponseWriter, _ *http.Request) {
 		w.Header().Set("Content-Type", "application/json")
-		w.Header().Set("RateLimit-Limit", "1000")
-		w.Header().Set("RateLimit-Remaining", "999")
-		w.Header().Set("RateLimit-Reset", "1511954577")
 		w.WriteHeader(http.StatusOK)
 		_, err := fmt.Fprint(w, `
 			{

diff --git a/bonsai/plan_test.go b/bonsai/plan_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func (s *ClientTestSuite) TestPlanClient_All() {
-	s.serveMux.HandleFunc(bonsai.PlanAPIBasePath, func(w http.ResponseWriter, _ *http.Request) {
+	s.serveMux.Get(bonsai.PlanAPIBasePath, func(w http.ResponseWriter, _ *http.Request) {
 		respStr := `
 		{
 		"plans": [
@@ -145,7 +145,7 @@ func (s *ClientTestSuite) TestPlanClient_GetByPath() {
 		}
 		`, targetPlanPath)
 
-	s.serveMux.HandleFunc(urlPath, func(w http.ResponseWriter, _ *http.Request) {
+	s.serveMux.Get(urlPath, func(w http.ResponseWriter, _ *http.Request) {
 		_, err = w.Write([]byte(respStr))
 		s.NoError(err, "wrote response string to writer")
 	})

diff --git a/bonsai/release_test.go b/bonsai/release_test.go
@@ -11,7 +11,7 @@ import (
 )
 
 func (s *ClientTestSuite) TestReleaseClient_All() {
-	s.serveMux.HandleFunc(bonsai.ReleaseAPIBasePath, func(w http.ResponseWriter, _ *http.Request) {
+	s.serveMux.Get(bonsai.ReleaseAPIBasePath, func(w http.ResponseWriter, _ *http.Request) {
 		respStr := `
 		{
 			"releases": [
@@ -84,7 +84,7 @@ func (s *ClientTestSuite) TestReleaseClient_GetBySlug() {
 	urlPath, err := url.JoinPath(bonsai.ReleaseAPIBasePath, targetReleaseSlug)
 	s.NoError(err, "successfully resolved path")
 
-	s.serveMux.HandleFunc(urlPath, func(w http.ResponseWriter, _ *http.Request) {
+	s.serveMux.Get(urlPath, func(w http.ResponseWriter, _ *http.Request) {
 		respStr := fmt.Sprintf(`
 		{
 			"name": "Elasticsearch 7.2.0",

diff --git a/bonsai/space_test.go b/bonsai/space_test.go
@@ -11,7 +11,7 @@ import (
 )
 
 func (s *ClientTestSuite) TestSpaceClient_All() {
-	s.serveMux.HandleFunc(bonsai.SpaceAPIBasePath, func(w http.ResponseWriter, _ *http.Request) {
+	s.serveMux.Get(bonsai.SpaceAPIBasePath, func(w http.ResponseWriter, _ *http.Request) {
 		respStr := `
 			{
 			  "spaces": [
@@ -64,7 +64,7 @@ func (s *ClientTestSuite) TestSpaceClient_GetByPath() {
 	urlPath, err := url.JoinPath(bonsai.SpaceAPIBasePath, targetSpacePath)
 	s.NoError(err, "successfully create url path")
 
-	s.serveMux.HandleFunc(urlPath, func(w http.ResponseWriter, _ *http.Request) {
+	s.serveMux.Get(urlPath, func(w http.ResponseWriter, _ *http.Request) {
 		respStr := fmt.Sprintf(`
 			{
 			    "path": "%s",