http: tests: add TestUnhandledMethod.

This allows a more orderly setting of HandledMethods in tests.
ipfs · Apr 3, 2020 · 471dafa · 471dafa
1 parent 6b465be
commit 471dafa
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 16 deletions.
diff --git a/http/errors_test.go b/http/errors_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ipfs/go-ipfs-cmds"
+	cmds "github.com/ipfs/go-ipfs-cmds"
 )
 
 func TestErrors(t *testing.T) {
@@ -116,7 +116,7 @@ func TestErrors(t *testing.T) {
 
 	mkTest := func(tc testcase) func(*testing.T) {
 		return func(t *testing.T) {
-			_, srv := getTestServer(t, nil) // handler_test:/^func getTestServer/
+			_, srv := getTestServer(t, nil, nil) // handler_test:/^func getTestServer/
 			c := NewClient(srv.URL)
 			req, err := cmds.NewRequest(context.Background(), tc.path, tc.opts, nil, nil, cmdRoot)
 			if err != nil {
@@ -158,3 +158,15 @@ func TestErrors(t *testing.T) {
 		t.Run(fmt.Sprintf("%d-%s", i, strings.Join(tc.path, "/")), mkTest(tc))
 	}
 }
+
+func TestUnhandledMethod(t *testing.T) {
+	tc := httpTestCase{
+		Method:         "GET",
+		HandledMethods: []string{"POST"},
+		Code:           http.StatusMethodNotAllowed,
+		ResHeaders: map[string]string{
+			"Allow": "POST",
+		},
+	}
+	tc.test(t)
+}
diff --git a/http/handler_test.go b/http/handler_test.go
@@ -292,7 +292,7 @@ var (
 	}
 )
 
-func getTestServer(t *testing.T, origins []string) (cmds.Environment, *httptest.Server) {
+func getTestServer(t *testing.T, origins []string, handledMethods []string) (cmds.Environment, *httptest.Server) {
 	if len(origins) == 0 {
 		origins = defaultOrigins
 	}
@@ -305,7 +305,15 @@ func getTestServer(t *testing.T, origins []string) (cmds.Environment, *httptest.
 		wait:        make(chan struct{}),
 	}
 
-	return env, httptest.NewServer(NewHandler(env, cmdRoot, originCfg(origins)))
+	srvCfg := originCfg(origins)
+
+	if len(handledMethods) == 0 {
+		srvCfg.HandledMethods = []string{"GET", "POST"}
+	} else {
+		srvCfg.HandledMethods = handledMethods
+	}
+
+	return env, httptest.NewServer(NewHandler(env, cmdRoot, srvCfg))
 }
 
 func errEq(err1, err2 error) bool {

diff --git a/http/http_test.go b/http/http_test.go
@@ -12,9 +12,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ipfs/go-ipfs-cmds"
+	cmds "github.com/ipfs/go-ipfs-cmds"
 
-	"github.com/ipfs/go-ipfs-files"
+	files "github.com/ipfs/go-ipfs-files"
 )
 
 func newReaderPathFile(t *testing.T, path string, reader io.ReadCloser, stat os.FileInfo) files.File {
@@ -88,7 +88,7 @@ func TestHTTP(t *testing.T) {
 
 	mkTest := func(tc testcase) func(*testing.T) {
 		return func(t *testing.T) {
-			env, srv := getTestServer(t, nil) // handler_test:/^func getTestServer/
+			env, srv := getTestServer(t, nil, nil) // handler_test:/^func getTestServer/
 			c := NewClient(srv.URL)
 			req, err := cmds.NewRequest(context.Background(), tc.path, nil, nil, nil, cmdRoot)
 			if err != nil {

diff --git a/http/reforigin_test.go b/http/reforigin_test.go
@@ -39,14 +39,15 @@ var defaultOrigins = []string{
 }
 
 type httpTestCase struct {
-	Method       string
-	Path         string
-	Code         int
-	Origin       string
-	Referer      string
-	AllowOrigins []string
-	ReqHeaders   map[string]string
-	ResHeaders   map[string]string
+	Method         string
+	Path           string
+	Code           int
+	Origin         string
+	Referer        string
+	AllowOrigins   []string
+	HandledMethods []string
+	ReqHeaders     map[string]string
+	ResHeaders     map[string]string
 }
 
 func (tc *httpTestCase) test(t *testing.T) {
@@ -84,7 +85,7 @@ func (tc *httpTestCase) test(t *testing.T) {
 	}
 
 	// server
-	_, server := getTestServer(t, tc.AllowOrigins)
+	_, server := getTestServer(t, tc.AllowOrigins, tc.HandledMethods)
 	if server == nil {
 		return
 	}