Dark-Alex-17/kapow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

control delete route no content on sucess

Browse Source
This commit is contained in:
César Gallego Rodríguez
2019-10-09 14:10:18 +02:00
parent f14d4ff512
commit f60c8a2423
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/server/control/control.go
+7 -5
View File
@@ -2,7 +2,6 @@ package control
import ( import (
"encoding/json" "encoding/json"
"fmt"
"io/ioutil" "io/ioutil"
"log" "log"
"net/http" "net/http"
@@ -30,11 +29,14 @@ func Run(bindAddr string) {
// user.Routes.Remove() []model.Route // user.Routes.Remove() []model.Route
var funcRemove func(id string) error var funcRemove func(id string) error
func removeRoute(http.ResponseWriter, *http.Request) { func removeRoute(res http.ResponseWriter, req *http.Request) {
vars := mux.Vars(req)
if err := funcRemove(""); err != nil { id, _ := vars["id"]
fmt.Printf("Mostoles, we've had a problem") if err := funcRemove(id); err != nil {
res.WriteHeader(http.StatusNotFound)
return
} }
res.WriteHeader(http.StatusNoContent)
} }
// user.Routes.List() []model.Route // user.Routes.List() []model.Route
internal/server/control/control_test.go
+1 -4
View File
@@ -81,7 +81,7 @@ func TestAddRouteReturnsCreated(t *testing.T) {
respJson := model.Route{} respJson := model.Route{}
if err := json.Unmarshal(resp.Body.Bytes(), &respJson); err == nil { if err := json.Unmarshal(resp.Body.Bytes(), &respJson); err == nil {
t.Errorf("Invalid JSON response. %s", resp.Body.String()) //FIXME: String comparsion not working t.Errorf("Invalid JSON response. %s", resp.Body.String()) //FIXME: String comparsion not working, comparing against itself?
} }
expectedRouteSpec := model.Route{Method: "GET", Pattern: "/hello", Entrypoint: "/bin/sh -c", Command: "echo Hello World | kapow set /response/body", Index: 0, ID: "ROUTE_XXXXXXXXXXXXXXXXXX"} expectedRouteSpec := model.Route{Method: "GET", Pattern: "/hello", Entrypoint: "/bin/sh -c", Command: "echo Hello World | kapow set /response/body", Index: 0, ID: "ROUTE_XXXXXXXXXXXXXXXXXX"}
@@ -92,7 +92,6 @@ func TestAddRouteReturnsCreated(t *testing.T) {
func TestRemoveRouteReturnsNotFound(t *testing.T) { func TestRemoveRouteReturnsNotFound(t *testing.T) {
t.Skip("****** WIP ******") t.Skip("****** WIP ******")
req := httptest.NewRequest(http.MethodDelete, "/routes/ROUTE_XXXXXXXXXXXXXXXXXX", nil) req := httptest.NewRequest(http.MethodDelete, "/routes/ROUTE_XXXXXXXXXXXXXXXXXX", nil)
resp := httptest.NewRecorder() resp := httptest.NewRecorder()
handler := http.HandlerFunc(removeRoute) handler := http.HandlerFunc(removeRoute)
@@ -112,8 +111,6 @@ func TestRemoveRouteReturnsNotFound(t *testing.T) {
} }
func TestRemoveRouteReturnsNoContent(t *testing.T) { func TestRemoveRouteReturnsNoContent(t *testing.T) {
t.Skip("****** WIP ******")
req := httptest.NewRequest(http.MethodDelete, "/routes/ROUTE_XXXXXXXXXXXXXXXXXX", nil) req := httptest.NewRequest(http.MethodDelete, "/routes/ROUTE_XXXXXXXXXXXXXXXXXX", nil)
resp := httptest.NewRecorder() resp := httptest.NewRecorder()
handler := http.HandlerFunc(removeRoute) handler := http.HandlerFunc(removeRoute)