Commit 9da7b2e8d8ed08cb193af2babf150cb8c7715f80
1 parent
a037c9c2
Exists in
master
and in
4 other branches
add specs for api -> merge request notes
Showing
1 changed file
with
11 additions
and
0 deletions
Show diff stats
spec/requests/api/notes_spec.rb
| @@ -6,8 +6,10 @@ describe Gitlab::API do | @@ -6,8 +6,10 @@ describe Gitlab::API do | ||
| 6 | let(:user) { create(:user) } | 6 | let(:user) { create(:user) } |
| 7 | let!(:project) { create(:project, namespace: user.namespace ) } | 7 | let!(:project) { create(:project, namespace: user.namespace ) } |
| 8 | let!(:issue) { create(:issue, project: project, author: user) } | 8 | let!(:issue) { create(:issue, project: project, author: user) } |
| 9 | + let!(:merge_request) { create(:merge_request, project: project, author: user) } | ||
| 9 | let!(:snippet) { create(:snippet, project: project, author: user) } | 10 | let!(:snippet) { create(:snippet, project: project, author: user) } |
| 10 | let!(:issue_note) { create(:note, noteable: issue, project: project, author: user) } | 11 | let!(:issue_note) { create(:note, noteable: issue, project: project, author: user) } |
| 12 | + let!(:merge_request_note) { create(:note, noteable: merge_request, project: project, author: user) } | ||
| 11 | let!(:snippet_note) { create(:note, noteable: snippet, project: project, author: user) } | 13 | let!(:snippet_note) { create(:note, noteable: snippet, project: project, author: user) } |
| 12 | let!(:wall_note) { create(:note, project: project, author: user) } | 14 | let!(:wall_note) { create(:note, project: project, author: user) } |
| 13 | before { project.team << [user, :reporter] } | 15 | before { project.team << [user, :reporter] } |
| @@ -64,6 +66,15 @@ describe Gitlab::API do | @@ -64,6 +66,15 @@ describe Gitlab::API do | ||
| 64 | json_response.first['body'].should == snippet_note.note | 66 | json_response.first['body'].should == snippet_note.note |
| 65 | end | 67 | end |
| 66 | end | 68 | end |
| 69 | + | ||
| 70 | + context "when noteable is a Merge Request" do | ||
| 71 | + it "should return an array of merge_requests notes" do | ||
| 72 | + get api("/projects/#{project.id}/merge_requests/#{merge_request.id}/notes", user) | ||
| 73 | + response.status.should == 200 | ||
| 74 | + json_response.should be_an Array | ||
| 75 | + json_response.first['body'].should == merge_request_note.note | ||
| 76 | + end | ||
| 77 | + end | ||
| 67 | end | 78 | end |
| 68 | 79 | ||
| 69 | describe "GET /projects/:id/noteable/:noteable_id/notes/:note_id" do | 80 | describe "GET /projects/:id/noteable/:noteable_id/notes/:note_id" do |