Not Found handling tweaks (#59)

.github/workflows/offline-tests.yml

@@ -23,7 +23,7 @@ jobs:
 
       - name: Install Hurl
         run: |
-          VERSION=5.0.1
+          VERSION=6.0.0
           curl --location --remote-name https://github.com/Orange-OpenSource/hurl/releases/download/$VERSION/hurl_${VERSION}_amd64.deb
           sudo apt update && sudo apt install ./hurl_${VERSION}_amd64.deb
       

offline/offline.go

@@ -43,10 +43,17 @@ func Run(filePath string, moduleName string, port string) error {
 
 	r := mux.NewRouter()
 
-	// 404 for not found
+	// Not Found handlers
 	r.MethodNotAllowedHandler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "text/plain; charset=utf-8")
+		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusNotFound)
+		w.Write([]byte(`{"message": "Not Found"}`))
+	})
+
+	r.NotFoundHandler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Type", "application/json")
+		w.WriteHeader(http.StatusNotFound)
+		w.Write([]byte(`{"message": "Not Found"}`))
 	})
 
 	// Start compiling and serving each handler

offline/offline_test.go

@@ -61,11 +61,4 @@ func TestPrintConfig(t *testing.T) {
 				endpoint, output)
 		}
 	}
-
-	// Test order of endpoints (GET before POST)
-	getIndex := strings.Index(output, "GET")
-	postIndex := strings.Index(output, "POST")
-	if getIndex > postIndex {
-		t.Error("Expected GET endpoint to appear before POST endpoint")
-	}
 }

terrable_build

@@ -1 +1 @@
-version = 0.3.0
+version = 0.3.1

tests/requests/echo_bad_method.hurl

@@ -1,2 +1,13 @@
+# Hit a route that exists but ot for the method in the request
 DELETE http://127.0.0.1:8081/
 HTTP 404
+
+[Asserts]
+jsonpath "$.message" == "Not Found"
+
+# Hit a route that doesn't exist at all
+GET http://127.0.0.1:8081/{{newUuid}}
+HTTP 404
+
+[Asserts]
+jsonpath "$.message" == "Not Found"