api: improve error handling for removeUser handler

Related to #183.

api/handler.go

@@ -201,7 +201,11 @@ func newUser(w http.ResponseWriter, r *http.Request) {
 func removeUser(w http.ResponseWriter, r *http.Request) {
 	name := r.URL.Query().Get(":name")
 	if err := user.Remove(name); err != nil {
-		http.Error(w, err.Error(), http.StatusBadRequest)
+		status := http.StatusInternalServerError
+		if err == user.ErrUserNotFound {
+			status = http.StatusNotFound
+		}
+		http.Error(w, err.Error(), status)
 		return
 	}
 	fmt.Fprintf(w, "User \"%s\" successfully removed\n", name)

api/handler_test.go

@@ -920,6 +920,15 @@ func (s *S) TestRemoveUserShouldRemoveFromDB(c *check.C) {
 	c.Assert(lenght, check.Equals, 0)
 }
 
+func (s *S) TestRemoveUserNotFound(c *check.C) {
+	request, err := http.NewRequest("DELETE", "/user/unknown-user", nil)
+	c.Assert(err, check.IsNil)
+	recorder := httptest.NewRecorder()
+	s.router.ServeHTTP(recorder, request)
+	c.Assert(recorder.Code, check.Equals, http.StatusNotFound)
+	c.Assert(recorder.Body.String(), check.Equals, "user not found\n")
+}
+
 func (s *S) TestRemoveRepository(c *check.C) {
 	r, err := repository.New("myRepo", []string{"pippin"}, []string{""}, true)
 	c.Assert(err, check.IsNil)