diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-03-09 19:29:11 -0600 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-05 17:44:14 +0100 |
| commit | 08bbb9fce66cb46d3262e6cd4c4379b59f065be0 (patch) | |
| tree | 159eeb7ca43419f29926d6e77637db18bddd20a9 /spec/services/issues | |
| parent | 8bdfee8ba5fb0a8f48501e63274c8f9ce5708007 (diff) | |
| download | gitlab-ce-08bbb9fce66cb46d3262e6cd4c4379b59f065be0.tar.gz | |
Add option to start a new discussion on an MR
Diffstat (limited to 'spec/services/issues')
| -rw-r--r-- | spec/services/issues/build_service_spec.rb | 4 | ||||
| -rw-r--r-- | spec/services/issues/create_service_spec.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/services/issues/build_service_spec.rb b/spec/services/issues/build_service_spec.rb index 17990f41b3b..d166b9783ad 100644 --- a/spec/services/issues/build_service_spec.rb +++ b/spec/services/issues/build_service_spec.rb @@ -96,13 +96,13 @@ describe Issues::BuildService, services: true do end it 'mentions all the authors in the description' do - authors = merge_request.diff_discussions.map(&:author) + authors = merge_request.resolvable_discussions.map(&:author) expect(issue.description).to include(*authors.map(&:to_reference)) end it 'has a link for each unresolved discussion in the description' do - notes = merge_request.diff_discussions.map(&:first_note) + notes = merge_request.resolvable_discussions.map(&:first_note) links = notes.map { |note| Gitlab::UrlBuilder.build(note) } expect(issue.description).to include(*links) diff --git a/spec/services/issues/create_service_spec.rb b/spec/services/issues/create_service_spec.rb index 776cbc4296b..80bfb731550 100644 --- a/spec/services/issues/create_service_spec.rb +++ b/spec/services/issues/create_service_spec.rb @@ -141,7 +141,7 @@ describe Issues::CreateService, services: true do it_behaves_like 'new issuable record that supports slash commands' context 'resolving discussions' do - let(:discussion) { Discussion.for_diff_notes([create(:diff_note_on_merge_request)]).first } + let(:discussion) { create(:diff_note_on_merge_request).to_discussion } let(:merge_request) { discussion.noteable } let(:project) { merge_request.source_project } |
