diff options
author | Rémy Coutable <remy@rymai.me> | 2017-02-16 11:22:38 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-02-16 11:22:38 +0000 |
commit | 680d37b3f3868d11e7cd46b3e965febde5806964 (patch) | |
tree | 8a38b9b16c7794c1c9b650ae69357fe2dbb16152 /spec/requests | |
parent | 4ee8cf43cdece9357fce4ed2c6f7c0203e11d2b3 (diff) | |
parent | 7a8d0aab61fa5d59a4bde5330948f1adcfbb542c (diff) | |
download | gitlab-ce-680d37b3f3868d11e7cd46b3e965febde5806964.tar.gz |
Merge branch '27873-when-a-commit-appears-in-several-projects-commit-comments-are-shared-across-projects' into 'master'
Ensure only commit comments relevant to target project are returned
Closes #27873
See merge request !9264
Diffstat (limited to 'spec/requests')
-rw-r--r-- | spec/requests/api/commits_spec.rb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb index 3d0d6735359..3eef10c0698 100644 --- a/spec/requests/api/commits_spec.rb +++ b/spec/requests/api/commits_spec.rb @@ -474,6 +474,20 @@ describe API::Commits, api: true do expect(response).to have_http_status(401) end end + + context 'when the commit is present on two projects' do + let(:forked_project) { create(:project, :repository, creator: user2, namespace: user2.namespace) } + let!(:forked_project_note) { create(:note_on_commit, author: user2, project: forked_project, commit_id: forked_project.repository.commit.id, note: 'a comment on a commit for fork') } + + it 'returns the comments for the target project' do + get api("/projects/#{forked_project.id}/repository/commits/#{forked_project.repository.commit.id}/comments", user2) + + expect(response).to have_http_status(200) + expect(json_response.length).to eq(1) + expect(json_response.first['note']).to eq('a comment on a commit for fork') + expect(json_response.first['author']['id']).to eq(user2.id) + end + end end describe 'POST :id/repository/commits/:sha/cherry_pick' do |