diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-06 14:04:14 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-06 14:04:14 +0000 |
commit | d9ef41cf4dd89716854ef27c4c6cbd93746e426a (patch) | |
tree | 4832a35d5cb7fa34b6ba4fdd06ada89dd123b33b /spec/requests/api | |
parent | e1198d4fe5cc24b6d3ca1368dd2300c9f4351cb5 (diff) | |
parent | 1123057ab792ac73b1611f4d3a9faf79369dd6da (diff) | |
download | gitlab-ce-d9ef41cf4dd89716854ef27c4c6cbd93746e426a.tar.gz |
Merge branch '23589-open-issue-for-mr' into 'master'
Create an issue for all unresolved discussions in an MR
See merge request !7180
Diffstat (limited to 'spec/requests/api')
-rw-r--r-- | spec/requests/api/issues_spec.rb | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb index 5700f800c2e..553983575c4 100644 --- a/spec/requests/api/issues_spec.rb +++ b/spec/requests/api/issues_spec.rb @@ -692,6 +692,32 @@ describe API::Issues, api: true do ]) end + context 'resolving issues in a merge request' do + let(:discussion) { Discussion.for_diff_notes([create(:diff_note_on_merge_request)]).first } + let(:merge_request) { discussion.noteable } + let(:project) { merge_request.source_project } + before do + project.team << [user, :master] + post api("/projects/#{project.id}/issues", user), + title: 'New Issue', + merge_request_for_resolving_discussions: merge_request.iid + end + + it 'creates a new project issue' do + expect(response).to have_http_status(:created) + end + + it 'resolves the discussions in a merge request' do + discussion.first_note.reload + + expect(discussion.resolved?).to be(true) + end + + it 'assigns a description to the issue mentioning the merge request' do + expect(json_response['description']).to include(merge_request.to_reference) + end + end + context 'with due date' do it 'creates a new project issue' do due_date = 2.weeks.from_now.strftime('%Y-%m-%d') |