Revert "Support template parameters when building request URLs (#99)"

This reverts commit 5278759.

Author: Stein Fletcher

apitest.go

@@ -237,80 +237,51 @@ func (a *APITest) Method(method string) *Request {
 }
 
 // Get is a convenience method for setting the request as http.MethodGet
-func (a *APITest) Get(url string, args ...interface{}) *Request {
+func (a *APITest) Get(url string) *Request {
 	a.request.method = http.MethodGet
-	if len(args) > 0 {
-		a.request.url = fmt.Sprintf(url, args...)
-	} else {
-		a.request.url = url
-	}
+	a.request.url = url
 	return a.request
 }
 
 // Post is a convenience method for setting the request as http.MethodPost
-func (a *APITest) Post(url string, args ...interface{}) *Request {
+func (a *APITest) Post(url string) *Request {
 	r := a.request
 	r.method = http.MethodPost
-	if len(args) > 0 {
-		a.request.url = fmt.Sprintf(url, args...)
-	} else {
-		a.request.url = url
-	}
+	r.url = url
 	return r
 }
 
 // Put is a convenience method for setting the request as http.MethodPut
-func (a *APITest) Put(url string, args ...interface{}) *Request {
+func (a *APITest) Put(url string) *Request {
 	r := a.request
 	r.method = http.MethodPut
-	if len(args) > 0 {
-		a.request.url = fmt.Sprintf(url, args...)
-	} else {
-		a.request.url = url
-	}
+	r.url = url
 	return r
 }
 
 // Delete is a convenience method for setting the request as http.MethodDelete
-func (a *APITest) Delete(url string, args ...interface{}) *Request {
+func (a *APITest) Delete(url string) *Request {
 	a.request.method = http.MethodDelete
-	if len(args) > 0 {
-		a.request.url = fmt.Sprintf(url, args...)
-	} else {
-		a.request.url = url
-	}
+	a.request.url = url
 	return a.request
 }
 
 // Patch is a convenience method for setting the request as http.MethodPatch
-func (a *APITest) Patch(url string, args ...interface{}) *Request {
+func (a *APITest) Patch(url string) *Request {
 	a.request.method = http.MethodPatch
-	if len(args) > 0 {
-		a.request.url = fmt.Sprintf(url, args...)
-	} else {
-		a.request.url = url
-	}
+	a.request.url = url
 	return a.request
 }
 
 // URL is a builder method for setting the url of the request
-func (r *Request) URL(url string, args ...interface{}) *Request {
-	if len(args) > 0 {
-		r.url = fmt.Sprintf(url, args...)
-	} else {
-		r.url = url
-	}
+func (r *Request) URL(url string) *Request {
+	r.url = url
 	return r
 }
 
 // Body is a builder method to set the request body
-func (r *Request) Body(b string, args ...interface{}) *Request {
+func (r *Request) Body(b string) *Request {
 	r.body = b
-	if len(args) > 0 {
-		r.body = fmt.Sprintf(b, args...)
-	} else {
-		r.body = b
-	}
 	return r
 }
 
@@ -479,13 +450,9 @@ type Response struct {
 // Assert is a user defined custom assertion function
 type Assert func(*http.Response, *http.Request) error
 
-// Body is the expected response body. The optional 'args' can be used for templating
-func (r *Response) Body(b string, args ...interface{}) *Response {
-	if len(args) > 0 {
-		r.body = fmt.Sprintf(b, args...)
-	} else {
-		r.body = b
-	}
+// Body is the expected response body
+func (r *Response) Body(b string) *Response {
+	r.body = b
 	return r
 }
 

apitest_test.go

@@ -54,69 +54,6 @@ func TestApiTest_AddsJSONBodyToRequest(t *testing.T) {
 		End()
 }
 
-func TestApiTest_RequestURLFormat(t *testing.T) {
-	apitest.New().
-		HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.WriteHeader(http.StatusOK)
-			assert.Equal(t, "/user/1234", r.URL.Path)
-		}).
-		Get("/user/%s", "1234").
-		Expect(t).
-		Status(http.StatusOK).
-		End()
-
-	apitest.New().
-		HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.WriteHeader(http.StatusOK)
-			assert.Equal(t, "/user/1234", r.URL.Path)
-		}).
-		Put("/user/%s", "1234").
-		Expect(t).
-		Status(http.StatusOK).
-		End()
-
-	apitest.New().
-		HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.WriteHeader(http.StatusOK)
-			assert.Equal(t, "/user/1234", r.URL.Path)
-		}).
-		Patch("/user/%s", "1234").
-		Expect(t).
-		Status(http.StatusOK).
-		End()
-
-	apitest.New().
-		HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.WriteHeader(http.StatusOK)
-			assert.Equal(t, "/user/1234", r.URL.Path)
-		}).
-		Post("/user/%s", "1234").
-		Expect(t).
-		Status(http.StatusOK).
-		End()
-
-	apitest.New().
-		HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.WriteHeader(http.StatusOK)
-			assert.Equal(t, "/user/1234", r.URL.Path)
-		}).
-		Delete("/user/%s", "1234").
-		Expect(t).
-		Status(http.StatusOK).
-		End()
-
-	apitest.New().
-		HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.WriteHeader(http.StatusOK)
-			assert.Equal(t, "/user/1234", r.URL.Path)
-		}).
-		Method(http.MethodGet).
-		URL("/user/%d", 1234).
-		Expect(t).
-		Status(http.StatusOK).
-		End()
-}
-
 func TestApiTest_JSONBody(t *testing.T) {
 	type bodyStruct struct {
 		A int `json:"a"`
@@ -464,26 +401,6 @@ func TestApiTest_MatchesJSONResponseBody(t *testing.T) {
 		End()
 }
 
-func TestApiTest_MatchesJSONResponseBodyWithTemplate(t *testing.T) {
-	handler := http.NewServeMux()
-	handler.HandleFunc("/hello", func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusCreated)
-		w.Header().Set("Content-Type", "application/json")
-		_, err := w.Write([]byte(`{"a": 12345}`))
-		if err != nil {
-			panic(err)
-		}
-	})
-
-	apitest.New().
-		Handler(handler).
-		Get("/hello").
-		Expect(t).
-		Body(`{"a": %d}`, 12345).
-		Status(http.StatusCreated).
-		End()
-}
-
 func TestApiTest_MatchesJSONBodyFromFile(t *testing.T) {
 	handler := http.NewServeMux()
 	handler.HandleFunc("/hello", func(w http.ResponseWriter, r *http.Request) {