diff options
| author | ZJ van de Weg <zegerjan@gitlab.com> | 2016-05-30 14:46:23 +0200 |
|---|---|---|
| committer | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-05-30 18:54:08 +0200 |
| commit | cbd7801b3d1d435a95ec70032c5acc9df33b0337 (patch) | |
| tree | 7bd367bf31690e4a6b0115d238cf2c312c9fb2ab /spec/features/notes_on_merge_requests_spec.rb | |
| parent | f99b38c9d5dab11677b2680a671c1a66fb69283b (diff) | |
| parent | 2485bd7bbf9686f993d2a417943feff5c7d5b6f3 (diff) | |
| download | gitlab-ce-cbd7801b3d1d435a95ec70032c5acc9df33b0337.tar.gz | |
Merge branch 'master' into awardables
Diffstat (limited to 'spec/features/notes_on_merge_requests_spec.rb')
| -rw-r--r-- | spec/features/notes_on_merge_requests_spec.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb index e8b78124ea1..de52460f15f 100644 --- a/spec/features/notes_on_merge_requests_spec.rb +++ b/spec/features/notes_on_merge_requests_spec.rb @@ -19,10 +19,14 @@ describe 'Comments', feature: true do end describe 'On a merge request', js: true, feature: true do - let!(:merge_request) { create(:merge_request) } - let!(:project) { merge_request.source_project } + let!(:project) { create(:project) } + let!(:merge_request) do + create(:merge_request, source_project: project, target_project: project) + end + let!(:note) do - create(:note_on_merge_request, :with_attachment, project: project) + create(:note_on_merge_request, :with_attachment, noteable: merge_request, + project: project) end before do |