diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-04-20 11:10:00 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-04-20 11:10:00 +0200 |
| commit | 27cc95ab499c08b634990b4c9266bb5ac6b64734 (patch) | |
| tree | 6a401b3d11fd6f7728253dca2e0c2e31548808ed /spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb | |
| parent | 5e2219db48719af5ca971f9222fffa7bd66cb6d8 (diff) | |
| parent | 08b2e7cd8f69603075edcb93a6a66b6407beb700 (diff) | |
| download | gitlab-ce-27cc95ab499c08b634990b4c9266bb5ac6b64734.tar.gz | |
Merge remote-tracking branch 'upstream/master' into 26914-add_deploy_history_data_source
Diffstat (limited to 'spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb')
| -rw-r--r-- | spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb b/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb index 572bca3de21..58f897cba3e 100644 --- a/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb +++ b/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb @@ -4,7 +4,7 @@ feature 'Resolving all open discussions in a merge request from an issue', featu let(:user) { create(:user) } let(:project) { create(:project) } let(:merge_request) { create(:merge_request, source_project: project) } - let!(:discussion) { Discussion.for_diff_notes([create(:diff_note_on_merge_request, noteable: merge_request, project: project)]).first } + let!(:discussion) { create(:diff_note_on_merge_request, noteable: merge_request, project: project).to_discussion } describe 'as a user with access to the project' do before do |