Commit cfe12a0d authored by blackst0ne's avatar blackst0ne

Resolve conflicts in spec/features/projects/merge_requests/user_creates_merge_request_spec.rb

parent 23f869c7
require 'spec_helper' require 'spec_helper'
describe 'User creates a merge request', :js do describe 'User creates a merge request', :js do
<<<<<<< HEAD
let(:project) do let(:project) do
create(:project, create(:project,
:repository, :repository,
...@@ -10,29 +9,19 @@ describe 'User creates a merge request', :js do ...@@ -10,29 +9,19 @@ describe 'User creates a merge request', :js do
end end
let(:user) { create(:user) } let(:user) { create(:user) }
let(:user2) { create(:user) } let(:user2) { create(:user) }
=======
let(:project) { create(:project, :repository) }
let(:user) { create(:user) }
>>>>>>> ce-com/master
before do before do
project.add_master(user) project.add_master(user)
sign_in(user) sign_in(user)
<<<<<<< HEAD
project.approvers.create(user_id: user.id) project.approvers.create(user_id: user.id)
=======
>>>>>>> ce-com/master
visit(project_new_merge_request_path(project)) visit(project_new_merge_request_path(project))
end end
it 'creates a merge request' do it 'creates a merge request' do
<<<<<<< HEAD
allow_any_instance_of(Gitlab::AuthorityAnalyzer).to receive(:calculate).and_return([user2]) allow_any_instance_of(Gitlab::AuthorityAnalyzer).to receive(:calculate).and_return([user2])
=======
>>>>>>> ce-com/master
find('.js-source-branch').click find('.js-source-branch').click
click_link('fix') click_link('fix')
...@@ -41,7 +30,6 @@ describe 'User creates a merge request', :js do ...@@ -41,7 +30,6 @@ describe 'User creates a merge request', :js do
click_button('Compare branches') click_button('Compare branches')
<<<<<<< HEAD
expect(find_field('merge_request_description').value).to eq('This merge request should contain the following.') expect(find_field('merge_request_description').value).to eq('This merge request should contain the following.')
# Approvers # Approvers
...@@ -60,8 +48,6 @@ describe 'User creates a merge request', :js do ...@@ -60,8 +48,6 @@ describe 'User creates a merge request', :js do
end end
# End of approvers # End of approvers
=======
>>>>>>> ce-com/master
fill_in('merge_request_title', with: 'Wiki Feature') fill_in('merge_request_title', with: 'Wiki Feature')
click_button('Submit merge request') click_button('Submit merge request')
...@@ -69,9 +55,6 @@ describe 'User creates a merge request', :js do ...@@ -69,9 +55,6 @@ describe 'User creates a merge request', :js do
expect(page).to have_content('Wiki Feature') expect(page).to have_content('Wiki Feature')
end end
<<<<<<< HEAD
# wait_for_requests
page.within('.issuable-actions') do page.within('.issuable-actions') do
click_link('Edit', match: :first) click_link('Edit', match: :first)
end end
...@@ -79,8 +62,5 @@ describe 'User creates a merge request', :js do ...@@ -79,8 +62,5 @@ describe 'User creates a merge request', :js do
page.within('ul.approver-list') do page.within('ul.approver-list') do
expect(page).to have_content(user2.name) expect(page).to have_content(user2.name)
end end
=======
wait_for_requests
>>>>>>> ce-com/master
end end
end end
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