Creating MR comment without a note returns status code 400 (Bad request)

Creating a comment to an existing merge request via API without providing a note returns a status code 400 now, suggesting a bad request. The reason for this is the resource itself (MR) exists but the required property is not set.

Creating MR comment without a note returns status code 400 (Bad request)
f978a71f · Sebastian Ziebell · 3f4e215c · f978a71f · f978a71f
Commit f978a71f authored Feb 05, 2013 by Sebastian Ziebell
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

merge_requests.rb lib/api/merge_requests.rb +3 -0

merge_requests_spec.rb spec/requests/api/merge_requests_spec.rb +5 -0

No files found.
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -128,6 +128,9 @@ module Gitlab
        if note.save
          present note, with: Entities::MRNote
        else
+          if note.errors[:note].any?
+            error!(note.errors[:note], 400)
+          end
          not_found!
        end
      end

--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -87,6 +87,11 @@ describe Gitlab::API do
      response.status.should == 201
      json_response['note'].should == 'My comment'
    end
+
+    it "should return 400 if note is missing" do
+      post api("/projects/#{project.id}/merge_request/#{merge_request.id}/comments", user)
+      response.status.should == 400
+    end
  end

 end