Merge cherry-pick modal specs
This commit is contained in:
parent
29cf2e0819
commit
4201d42857
|
@ -16,7 +16,7 @@ describe 'Merge request > User sees check out branch modal', :js do
|
|||
expect(page).to have_content('Check out, review, and merge locally')
|
||||
end
|
||||
|
||||
it 'closes the check out branch modal with Escape keypress' do
|
||||
it 'closes the check out branch modal with escape keypress' do
|
||||
find('#modal_merge_info').send_keys(:escape)
|
||||
|
||||
expect(page).not_to have_content('Check out, review, and merge locally')
|
||||
|
|
|
@ -21,7 +21,7 @@ describe 'Merge request > User cherry-picks', :js do
|
|||
end
|
||||
|
||||
# Fast-forward merge, or merged before GitLab 8.5.
|
||||
context 'Without a merge commit' do
|
||||
context 'without a merge commit' do
|
||||
before do
|
||||
merge_request.merge_commit_sha = nil
|
||||
merge_request.save
|
||||
|
@ -34,7 +34,7 @@ describe 'Merge request > User cherry-picks', :js do
|
|||
end
|
||||
end
|
||||
|
||||
context 'With a merge commit' do
|
||||
context 'with a merge commit' do
|
||||
it 'shows a Cherry-pick button' do
|
||||
visit project_merge_request_path(project, merge_request)
|
||||
|
||||
|
@ -49,5 +49,23 @@ describe 'Merge request > User cherry-picks', :js do
|
|||
expect(page).not_to have_link 'Cherry-pick'
|
||||
end
|
||||
end
|
||||
|
||||
context 'and seeing the cherry-pick modal' do
|
||||
before do
|
||||
visit project_merge_request_path(project, merge_request)
|
||||
|
||||
click_link('Cherry-pick')
|
||||
end
|
||||
|
||||
it 'shows the cherry-pick modal' do
|
||||
expect(page).to have_content('Cherry-pick this merge request')
|
||||
end
|
||||
|
||||
it 'closes the cherry-pick modal with escape keypress' do
|
||||
find('#modal-cherry-pick-commit').send_keys(:escape)
|
||||
|
||||
expect(page).not_to have_content('Start a new merge request with these changes')
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
|
@ -1,25 +0,0 @@
|
|||
require 'rails_helper'
|
||||
|
||||
describe 'Merge request > User sees cherry-pick modal', :js do
|
||||
let(:project) { create(:project, :public, :repository) }
|
||||
let(:user) { project.creator }
|
||||
let(:merge_request) { create(:merge_request, source_project: project) }
|
||||
|
||||
before do
|
||||
sign_in(user)
|
||||
visit(project_merge_request_path(project, merge_request))
|
||||
click_button('Merge')
|
||||
visit(merge_request_path(merge_request))
|
||||
click_link('Cherry-pick')
|
||||
end
|
||||
|
||||
it 'shows the cherry-pick modal' do
|
||||
expect(page).to have_content('Cherry-pick this merge request')
|
||||
end
|
||||
|
||||
it 'closes the cherry-pick modal with escape keypress' do
|
||||
find('#modal-cherry-pick-commit').send_keys(:escape)
|
||||
|
||||
expect(page).not_to have_content('Start a new merge request with these changes')
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue