GitList

Browse code

pkg/plugins: use constants for http methods

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2019/10/13 03:44:07
Showing 4 changed files

pkg/plugins/client_test.go index 12f67db..2540ec3 100644
pkg/plugins/plugin_test.go index ce98078..12c35cc 100644
pkg/plugins/transport/http_test.go index 78ab237..2573306 100644
pkg/plugins/transport/transport.go index 9cb1333..6c66cad 100644

@@ -70,7 +70,7 @@ func TestEchoInputOutput(t *testing.T) {
                      	m := Manifest{[]string{"VolumeDriver", "NetworkDriver"}}
                      	mux.HandleFunc("/Test.Echo", func(w http.ResponseWriter, r *http.Request) {
                     -		if r.Method != "POST" {
                     +		if r.Method != http.MethodPost {
                      			t.Fatalf("Expected POST, got %s\n", r.Method)
+                     		}
@@ -185,7 +185,7 @@ func TestClientStream(t *testing.T) {
                      	var output Manifest
                      	mux.HandleFunc("/Test.Echo", func(w http.ResponseWriter, r *http.Request) {
                     -		if r.Method != "POST" {
                     +		if r.Method != http.MethodPost {
                      			t.Fatalf("Expected POST, got %s", r.Method)
+                     		}
@@ -218,7 +218,7 @@ func TestClientSendFile(t *testing.T) {
                      		t.Fatal(err)
+                     	}
                      	mux.HandleFunc("/Test.Echo", func(w http.ResponseWriter, r *http.Request) {
                     -		if r.Method != "POST" {
                     +		if r.Method != http.MethodPost {
                      			t.Fatalf("Expected POST, got %s\n", r.Method)
+                     		}
@@ -263,7 +263,7 @@ type testRequestWrapper struct {
+                     }
                      func (w *testRequestWrapper) NewRequest(path string, data io.Reader) (*http.Request, error) {
                     -	req, err := http.NewRequest("POST", path, data)
                     +	req, err := http.NewRequest(http.MethodPost, path, data)
                      	if err != nil {
                      		return nil, err
+                     	}

pkg/plugins/plugin_test.go

History View file @ aa655a4

@@ -95,7 +95,7 @@ func TestPluginWithNoManifest(t *testing.T) {
 	}
 
 	mux.HandleFunc("/Plugin.Activate", func(w http.ResponseWriter, r *http.Request) {
-		if r.Method != "POST" {
+		if r.Method != http.MethodPost {
 			t.Fatalf("Expected POST, got %s\n", r.Method)
 		}
 

pkg/plugins/transport/http_test.go

History View file @ aa655a4

@@ -17,5 +17,5 @@ func TestHTTPTransport(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	assert.Check(t, is.Equal("POST", request.Method))
+	assert.Check(t, is.Equal(http.MethodPost, request.Method))
 }

pkg/plugins/transport/transport.go

History View file @ aa655a4

@@ -27,7 +27,7 @@ func newHTTPRequest(path string, data io.Reader) (*http.Request, error) {
 	if !strings.HasPrefix(path, "/") {
 		path = "/" + path
 	}
-	req, err := http.NewRequest("POST", path, data)
+	req, err := http.NewRequest(http.MethodPost, path, data)
 	if err != nil {
 		return nil, err
 	}

...	...	@@ -95,7 +95,7 @@ func TestPluginWithNoManifest(t *testing.T) {
95	95	}
96	96
97	97	mux.HandleFunc("/Plugin.Activate", func(w http.ResponseWriter, r *http.Request) {
98		- if r.Method != "POST" {
	98	+ if r.Method != http.MethodPost {
99	99	t.Fatalf("Expected POST, got %s\n", r.Method)
100	100	}
101	101

...	...	@@ -17,5 +17,5 @@ func TestHTTPTransport(t *testing.T) {
17	17	if err != nil {
18	18	t.Fatal(err)
19	19	}
20		- assert.Check(t, is.Equal("POST", request.Method))
	20	+ assert.Check(t, is.Equal(http.MethodPost, request.Method))
21	21	}

...	...	@@ -27,7 +27,7 @@ func newHTTPRequest(path string, data io.Reader) (*http.Request, error) {
27	27	if !strings.HasPrefix(path, "/") {
28	28	path = "/" + path
29	29	}
30		- req, err := http.NewRequest("POST", path, data)
	30	+ req, err := http.NewRequest(http.MethodPost, path, data)
31	31	if err != nil {
32	32	return nil, err
33	33	}