| ... | @@ -8,29 +8,29 @@ describe Issues::BuildService do |
... | @@ -8,29 +8,29 @@ describe Issues::BuildService do |
|
|
project.add_developer(user)
|
|
project.add_developer(user)
|
|
|
end
|
|
end
|
|
|
|
|
|
|
|
|
def build_issue(issue_params = {})
|
|
|
|
described_class.new(project, user, issue_params).execute
|
|
|
|
end
|
|
|
|
|
|
|
context 'for a single discussion' do
|
|
context 'for a single discussion' do
|
|
|
describe '#execute' do
|
|
describe '#execute' do
|
|
|
let(:merge_request) { create(:merge_request, title: "Hello world", source_project: project) }
|
|
let(:merge_request) { create(:merge_request, title: "Hello world", source_project: project) }
|
|
|
let(:discussion) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, note: "Almost done").to_discussion }
|
|
let(:discussion) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, note: "Almost done").to_discussion }
|
|
|
let(:service) { described_class.new(project, user, merge_request_to_resolve_discussions_of: merge_request.iid, discussion_to_resolve: discussion.id) }
|
|
|
|
|
|
|
|
|
|
it 'references the noteable title in the issue title' do
|
|
subject { build_issue(merge_request_to_resolve_discussions_of: merge_request.iid, discussion_to_resolve: discussion.id) }
|
|
|
issue = service.execute
|
|
|
|
|
|
|
|
|
|
expect(issue.title).to include('Hello world')
|
|
it 'references the noteable title in the issue title' do
|
|
|
|
expect(subject.title).to include('Hello world')
|
|
|
end
|
|
end
|
|
|
|
|
|
|
|
it 'adds the note content to the description' do
|
|
it 'adds the note content to the description' do
|
|
|
issue = service.execute
|
|
expect(subject.description).to include('Almost done')
|
|
|
|
|
|
|
|
expect(issue.description).to include('Almost done')
|
|
|
|
|
end
|
|
end
|
|
|
end
|
|
end
|
|
|
end
|
|
end
|
|
|
|
|
|
|
|
context 'for discussions in a merge request' do
|
|
context 'for discussions in a merge request' do
|
|
|
let(:merge_request) { create(:merge_request_with_diff_notes, source_project: project) }
|
|
let(:merge_request) { create(:merge_request_with_diff_notes, source_project: project) }
|
|
|
let(:issue) { described_class.new(project, user, merge_request_to_resolve_discussions_of: merge_request.iid).execute }
|
|
|
|
|
|
|
|
|
|
describe '#items_for_discussions' do
|
|
describe '#items_for_discussions' do
|
|
|
it 'has an item for each discussion' do
|
|
it 'has an item for each discussion' do
|
| ... | @@ -66,28 +66,30 @@ describe Issues::BuildService do |
... | @@ -66,28 +66,30 @@ describe Issues::BuildService do |
|
|
end
|
|
end
|
|
|
|
|
|
|
|
describe '#execute' do
|
|
describe '#execute' do
|
|
|
|
let(:base_params) { { merge_request_to_resolve_discussions_of: merge_request.iid } }
|
|
|
|
|
|
|
|
context 'without additional params' do
|
|
|
|
subject { build_issue(base_params) }
|
|
|
|
|
|
|
it 'has the merge request reference in the title' do
|
|
it 'has the merge request reference in the title' do
|
|
|
expect(issue.title).to include(merge_request.title)
|
|
expect(subject.title).to include(merge_request.title)
|
|
|
end
|
|
end
|
|
|
|
|
|
|
|
it 'has the reference of the merge request in the description' do
|
|
it 'has the reference of the merge request in the description' do
|
|
|
expect(issue.description).to include(merge_request.to_reference)
|
|
expect(subject.description).to include(merge_request.to_reference)
|
|
|
|
end
|
|
|
end
|
|
end
|
|
|
|
|
|
|
|
it 'does not assign title when a title was given' do
|
|
it 'uses provided title if title param given' do
|
|
|
issue = described_class.new(project, user,
|
|
issue = build_issue(base_params.merge(title: 'What an issue'))
|
|
|
merge_request_to_resolve_discussions_of: merge_request,
|
|
|
|
|
title: 'What an issue').execute
|
|
|
|
|
|
|
|
|
|
expect(issue.title).to eq('What an issue')
|
|
expect(issue.title).to eq('What an issue')
|
|
|
end
|
|
end
|
|
|
|
|
|
|
|
it 'does not assign description when a description was given' do
|
|
it 'uses provided description if description param given' do
|
|
|
issue = described_class.new(project, user,
|
|
issue = build_issue(base_params.merge(description: 'Fix at your earliest convenience'))
|
|
|
merge_request_to_resolve_discussions_of: merge_request,
|
|
|
|
|
description: 'Fix at your earliest conveignance').execute
|
|
|
|
|
|
|
|
|
|
expect(issue.description).to eq('Fix at your earliest conveignance')
|
|
expect(issue.description).to eq('Fix at your earliest convenience')
|
|
|
end
|
|
end
|
|
|
|
|
|
|
|
describe 'with multiple discussions' do
|
|
describe 'with multiple discussions' do
|
| ... | @@ -96,20 +98,20 @@ describe Issues::BuildService do |
... | @@ -96,20 +98,20 @@ describe Issues::BuildService do |
|
|
it 'mentions all the authors in the description' do
|
|
it 'mentions all the authors in the description' do
|
|
|
authors = merge_request.resolvable_discussions.map(&:author)
|
|
authors = merge_request.resolvable_discussions.map(&:author)
|
|
|
|
|
|
|
|
expect(issue.description).to include(*authors.map(&:to_reference))
|
|
expect(build_issue(base_params).description).to include(*authors.map(&:to_reference))
|
|
|
end
|
|
end
|
|
|
|
|
|
|
|
it 'has a link for each unresolved discussion in the description' do
|
|
it 'has a link for each unresolved discussion in the description' do
|
|
|
notes = merge_request.resolvable_discussions.map(&:first_note)
|
|
notes = merge_request.resolvable_discussions.map(&:first_note)
|
|
|
links = notes.map { |note| Gitlab::UrlBuilder.build(note) }
|
|
links = notes.map { |note| Gitlab::UrlBuilder.build(note) }
|
|
|
|
|
|
|
|
expect(issue.description).to include(*links)
|
|
expect(build_issue(base_params).description).to include(*links)
|
|
|
end
|
|
end
|
|
|
|
|
|
|
|
it 'mentions additional notes' do
|
|
it 'mentions additional notes' do
|
|
|
create_list(:diff_note_on_merge_request, 2, noteable: merge_request, project: merge_request.target_project, in_reply_to: diff_note)
|
|
create_list(:diff_note_on_merge_request, 2, noteable: merge_request, project: merge_request.target_project, in_reply_to: diff_note)
|
|
|
|
|
|
|
|
expect(issue.description).to include('(+2 comments)')
|
|
expect(build_issue(base_params).description).to include('(+2 comments)')
|
|
|
end
|
|
end
|
|
|
end
|
|
end
|
|
|
end
|
|
end
|
| ... | @@ -120,7 +122,7 @@ describe Issues::BuildService do |
... | @@ -120,7 +122,7 @@ describe Issues::BuildService do |
|
|
|
|
|
|
|
describe '#execute' do
|
|
describe '#execute' do
|
|
|
it 'mentions the merge request in the description' do
|
|
it 'mentions the merge request in the description' do
|
|
|
issue = described_class.new(project, user, merge_request_to_resolve_discussions_of: merge_request.iid).execute
|
|
issue = build_issue(merge_request_to_resolve_discussions_of: merge_request.iid)
|
|
|
|
|
|
|
|
expect(issue.description).to include("Review the conversation in #{merge_request.to_reference}")
|
|
expect(issue.description).to include("Review the conversation in #{merge_request.to_reference}")
|
|
|
end
|
|
end
|
| ... | @@ -128,20 +130,18 @@ describe Issues::BuildService do |
... | @@ -128,20 +130,18 @@ describe Issues::BuildService do |
|
|
end
|
|
end
|
|
|
|
|
|
|
|
describe '#execute' do
|
|
describe '#execute' do
|
|
|
let(:milestone) { create(:milestone, project: project) }
|
|
|
|
|
|
|
|
|
|
it 'builds a new issues with given params' do
|
|
it 'builds a new issues with given params' do
|
|
|
issue = described_class.new(
|
|
milestone = create(:milestone, project: project)
|
|
|
project,
|
|
issue = build_issue(milestone_id: milestone.id)
|
|
|
user,
|
|
|
|
|
title: 'Issue #1',
|
|
|
|
|
description: 'Issue description',
|
|
|
|
|
milestone_id: milestone.id
|
|
|
|
|
).execute
|
|
|
|
|
|
|
|
|
|
expect(issue.title).to eq('Issue #1')
|
|
|
|
|
expect(issue.description).to eq('Issue description')
|
|
|
|
|
expect(issue.milestone).to eq(milestone)
|
|
expect(issue.milestone).to eq(milestone)
|
|
|
end
|
|
end
|
|
|
|
|
|
|
|
it 'sets milestone to nil if it is not available for the project' do
|
|
|
|
milestone = create(:milestone, project: create(:project))
|
|
|
|
issue = build_issue(milestone_id: milestone.id)
|
|
|
|
|
|
|
|
expect(issue.milestone).to be_nil
|
|
|
|
end
|
|
|
end
|
|
end
|
|
|
end |
|
end |