Merge pull request #218 from DayS1eeper/master

fix routes order
Admiral-Piett · Feb 27, 2020 · 8b6ddf5 · 8b6ddf5
2 parents 4d29b1e + 3ba1059
commit 8b6ddf5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/app/router/router.go b/app/router/router.go
@@ -21,8 +21,8 @@ func New() http.Handler {
 	r.HandleFunc("/health", health).Methods("GET")
 	r.HandleFunc("/{account}", actionHandler).Methods("GET", "POST")
 	r.HandleFunc("/queue/{queueName}", actionHandler).Methods("GET", "POST")
-	r.HandleFunc("/{account}/{queueName}", actionHandler).Methods("GET", "POST")
 	r.HandleFunc("/SimpleNotificationService/{id}.pem", pemHandler).Methods("GET")
+	r.HandleFunc("/{account}/{queueName}", actionHandler).Methods("GET", "POST")
 
 	return r
 }

diff --git a/app/router/router_test.go b/app/router/router_test.go
@@ -90,3 +90,19 @@ func TestIndexServerhandler_POST_GoodRequest_With_URL(t *testing.T) {
 			status, http.StatusOK)
 	}
 }
+
+func TestIndexServerhandler_GET_GoodRequest_Pem_cert(t *testing.T) {
+
+	req, err := http.NewRequest("GET", "/SimpleNotificationService/100010001000.pem", nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	rr := httptest.NewRecorder()
+	New().ServeHTTP(rr, req)
+
+	if status := rr.Code; status != http.StatusOK {
+		t.Errorf("handler returned wrong status code: got %v want %v",
+			status, http.StatusOK)
+	}
+}