fix integration tests (#3311)

This commit is contained in:
Pedro Maia Costa
2025-02-12 11:16:51 +00:00
committed by GitHub
parent b41de7fcd1
commit d48edb9837
14 changed files with 264 additions and 195 deletions

View File

@ -1,4 +1,7 @@
package rest
//go:build integration
// +build integration
package rest_test
import (
"context"
@ -7,10 +10,12 @@ import (
"net/http"
"testing"
"github.com/netbirdio/netbird/management/server/http/api"
"github.com/netbirdio/netbird/management/server/http/util"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/netbirdio/netbird/management/client/rest"
"github.com/netbirdio/netbird/management/server/http/api"
"github.com/netbirdio/netbird/management/server/http/util"
)
var (
@ -21,7 +26,7 @@ var (
)
func TestRoutes_List_200(t *testing.T) {
withMockClient(func(c *Client, mux *http.ServeMux) {
withMockClient(func(c *rest.Client, mux *http.ServeMux) {
mux.HandleFunc("/api/routes", func(w http.ResponseWriter, r *http.Request) {
retBytes, _ := json.Marshal([]api.Route{testRoute})
_, err := w.Write(retBytes)
@ -35,7 +40,7 @@ func TestRoutes_List_200(t *testing.T) {
}
func TestRoutes_List_Err(t *testing.T) {
withMockClient(func(c *Client, mux *http.ServeMux) {
withMockClient(func(c *rest.Client, mux *http.ServeMux) {
mux.HandleFunc("/api/routes", func(w http.ResponseWriter, r *http.Request) {
retBytes, _ := json.Marshal(util.ErrorResponse{Message: "No", Code: 400})
w.WriteHeader(400)
@ -50,7 +55,7 @@ func TestRoutes_List_Err(t *testing.T) {
}
func TestRoutes_Get_200(t *testing.T) {
withMockClient(func(c *Client, mux *http.ServeMux) {
withMockClient(func(c *rest.Client, mux *http.ServeMux) {
mux.HandleFunc("/api/routes/Test", func(w http.ResponseWriter, r *http.Request) {
retBytes, _ := json.Marshal(testRoute)
_, err := w.Write(retBytes)
@ -63,7 +68,7 @@ func TestRoutes_Get_200(t *testing.T) {
}
func TestRoutes_Get_Err(t *testing.T) {
withMockClient(func(c *Client, mux *http.ServeMux) {
withMockClient(func(c *rest.Client, mux *http.ServeMux) {
mux.HandleFunc("/api/routes/Test", func(w http.ResponseWriter, r *http.Request) {
retBytes, _ := json.Marshal(util.ErrorResponse{Message: "No", Code: 400})
w.WriteHeader(400)
@ -78,7 +83,7 @@ func TestRoutes_Get_Err(t *testing.T) {
}
func TestRoutes_Create_200(t *testing.T) {
withMockClient(func(c *Client, mux *http.ServeMux) {
withMockClient(func(c *rest.Client, mux *http.ServeMux) {
mux.HandleFunc("/api/routes", func(w http.ResponseWriter, r *http.Request) {
assert.Equal(t, "POST", r.Method)
reqBytes, err := io.ReadAll(r.Body)
@ -100,7 +105,7 @@ func TestRoutes_Create_200(t *testing.T) {
}
func TestRoutes_Create_Err(t *testing.T) {
withMockClient(func(c *Client, mux *http.ServeMux) {
withMockClient(func(c *rest.Client, mux *http.ServeMux) {
mux.HandleFunc("/api/routes", func(w http.ResponseWriter, r *http.Request) {
retBytes, _ := json.Marshal(util.ErrorResponse{Message: "No", Code: 400})
w.WriteHeader(400)
@ -117,7 +122,7 @@ func TestRoutes_Create_Err(t *testing.T) {
}
func TestRoutes_Update_200(t *testing.T) {
withMockClient(func(c *Client, mux *http.ServeMux) {
withMockClient(func(c *rest.Client, mux *http.ServeMux) {
mux.HandleFunc("/api/routes/Test", func(w http.ResponseWriter, r *http.Request) {
assert.Equal(t, "PUT", r.Method)
reqBytes, err := io.ReadAll(r.Body)
@ -139,7 +144,7 @@ func TestRoutes_Update_200(t *testing.T) {
}
func TestRoutes_Update_Err(t *testing.T) {
withMockClient(func(c *Client, mux *http.ServeMux) {
withMockClient(func(c *rest.Client, mux *http.ServeMux) {
mux.HandleFunc("/api/routes/Test", func(w http.ResponseWriter, r *http.Request) {
retBytes, _ := json.Marshal(util.ErrorResponse{Message: "No", Code: 400})
w.WriteHeader(400)
@ -156,7 +161,7 @@ func TestRoutes_Update_Err(t *testing.T) {
}
func TestRoutes_Delete_200(t *testing.T) {
withMockClient(func(c *Client, mux *http.ServeMux) {
withMockClient(func(c *rest.Client, mux *http.ServeMux) {
mux.HandleFunc("/api/routes/Test", func(w http.ResponseWriter, r *http.Request) {
assert.Equal(t, "DELETE", r.Method)
w.WriteHeader(200)
@ -167,7 +172,7 @@ func TestRoutes_Delete_200(t *testing.T) {
}
func TestRoutes_Delete_Err(t *testing.T) {
withMockClient(func(c *Client, mux *http.ServeMux) {
withMockClient(func(c *rest.Client, mux *http.ServeMux) {
mux.HandleFunc("/api/routes/Test", func(w http.ResponseWriter, r *http.Request) {
retBytes, _ := json.Marshal(util.ErrorResponse{Message: "Not found", Code: 404})
w.WriteHeader(404)
@ -181,7 +186,7 @@ func TestRoutes_Delete_Err(t *testing.T) {
}
func TestRoutes_Integration(t *testing.T) {
withBlackBoxServer(t, func(c *Client) {
withBlackBoxServer(t, func(c *rest.Client) {
route, err := c.Routes.Create(context.Background(), api.RouteRequest{
Description: "Meow",
Enabled: false,