Commit 29cf2e08 authored by George Tsiolis's avatar George Tsiolis

Add spec for closing cherry-pick modal on escape keypress

parent f0f65047
---
title: Close revert and cherry pick modal on escape keypress
merge_request: 20341
author: George Tsiolis
type: changed
require 'rails_helper' require 'rails_helper'
describe 'Merge request > User sees Check out branch modal', :js do describe 'Merge request > User sees check out branch modal', :js do
let(:project) { create(:project, :public, :repository) } let(:project) { create(:project, :public, :repository) }
let(:user) { project.creator } let(:user) { project.creator }
let(:merge_request) { create(:merge_request, source_project: project) } let(:merge_request) { create(:merge_request, source_project: project) }
...@@ -16,7 +16,7 @@ describe 'Merge request > User sees Check out branch modal', :js do ...@@ -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') expect(page).to have_content('Check out, review, and merge locally')
end end
it 'closes the check out branch model with Escape keypress' do it 'closes the check out branch modal with Escape keypress' do
find('#modal_merge_info').send_keys(:escape) find('#modal_merge_info').send_keys(:escape)
expect(page).not_to have_content('Check out, review, and merge locally') expect(page).not_to have_content('Check out, review, and merge locally')
......
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
require 'rails_helper' require 'rails_helper'
describe 'Merge request > User sees Revert modal', :js do describe 'Merge request > User sees revert modal', :js do
let(:project) { create(:project, :public, :repository) } let(:project) { create(:project, :public, :repository) }
let(:user) { project.creator } let(:user) { project.creator }
let(:merge_request) { create(:merge_request, source_project: project) } let(:merge_request) { create(:merge_request, source_project: project) }
before do before do
sign_in(user) sign_in(user)
visit project_merge_request_path(project, merge_request) visit(project_merge_request_path(project, merge_request))
click_button('Merge') click_button('Merge')
visit(merge_request_path(merge_request)) visit(merge_request_path(merge_request))
click_link('Revert') click_link('Revert')
......
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