Commit d8bc02a2 authored by Bob Van Landuyt's avatar Bob Van Landuyt

Don't expect to find current_user as an approver

Since now we're setting the auhtor in the `MergeRequest::BuildService`
parent 8a064492
...@@ -8,13 +8,15 @@ describe 'User creates a merge request', :js do ...@@ -8,13 +8,15 @@ describe 'User creates a merge request', :js do
merge_requests_template: 'This merge request should contain the following.') merge_requests_template: 'This merge request should contain the following.')
end end
let(:user) { create(:user) } let(:user) { create(:user) }
let(:approver) { create(:user) }
let(:user2) { create(:user) } let(:user2) { create(:user) }
before do before do
project.add_master(user) project.add_master(user)
project.add_master(approver)
sign_in(user) sign_in(user)
project.approvers.create(user_id: user.id) project.approvers.create(user_id: approver.id)
visit(project_new_merge_request_path(project)) visit(project_new_merge_request_path(project))
end end
...@@ -34,7 +36,7 @@ describe 'User creates a merge request', :js do ...@@ -34,7 +36,7 @@ describe 'User creates a merge request', :js do
# Approvers # Approvers
page.within('ul .unsaved-approvers') do page.within('ul .unsaved-approvers') do
expect(page).to have_content(user.name) expect(page).to have_content(approver.name)
end end
page.within('.suggested-approvers') do page.within('.suggested-approvers') do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment