diff options
author | Rémy Coutable <remy@rymai.me> | 2017-08-04 19:14:04 +0200 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-01-31 18:31:21 +0100 |
commit | a2718ebaffd431b1eec91f3ee467d9632309b5f2 (patch) | |
tree | cb9953a334be6f4e026d1ed35ef57130b731d7e3 /spec/features/dashboard/merge_requests_spec.rb | |
parent | 9c34c023808b38303d4988a20f62645c552951e3 (diff) | |
download | gitlab-ce-a2718ebaffd431b1eec91f3ee467d9632309b5f2.tar.gz |
Make user/author use project.creator in most factories
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec/features/dashboard/merge_requests_spec.rb')
-rw-r--r-- | spec/features/dashboard/merge_requests_spec.rb | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/spec/features/dashboard/merge_requests_spec.rb b/spec/features/dashboard/merge_requests_spec.rb index 991d360ccaf..744041ac425 100644 --- a/spec/features/dashboard/merge_requests_spec.rb +++ b/spec/features/dashboard/merge_requests_spec.rb @@ -44,36 +44,38 @@ feature 'Dashboard Merge Requests' do context 'merge requests exist' do let!(:assigned_merge_request) do - create(:merge_request, assignee: current_user, target_project: project, source_project: project) + create(:merge_request, + assignee: current_user, + source_project: project, + author: create(:user)) end let!(:assigned_merge_request_from_fork) do create(:merge_request, source_branch: 'markdown', assignee: current_user, - target_project: public_project, source_project: forked_project - ) + target_project: public_project, source_project: forked_project, + author: create(:user)) end let!(:authored_merge_request) do create(:merge_request, - source_branch: 'markdown', author: current_user, - target_project: project, source_project: project - ) + source_branch: 'markdown', + source_project: project, + author: current_user) end let!(:authored_merge_request_from_fork) do create(:merge_request, source_branch: 'feature_conflict', author: current_user, - target_project: public_project, source_project: forked_project - ) + target_project: public_project, source_project: forked_project) end let!(:other_merge_request) do create(:merge_request, source_branch: 'fix', - target_project: project, source_project: project - ) + source_project: project, + author: create(:user)) end before do |