Merge branch 'close-revert-and-cherry-pick-modal-on-escape-keypress' into 'master'

Close revert and cherry pick modal on escape keypress

See merge request gitlab-org/gitlab-ce!20341

5 files changed, 53 insertions, 5 deletions

diff --git a/app/views/projects/commit/_change.html.haml b/app/views/projects/commit/_change.html.haml
index 3d97e93c9e9..14a7e84394a 100644
--- a/app/views/projects/commit/_change.html.haml
+++ b/app/views/projects/commit/_change.html.haml
@@ -11,7 +11,7 @@
   - branch_label = s_('ChangeTypeActionLabel|Pick into branch')
   - title = commit.merged_merge_request(current_user) ? _('Cherry-pick this merge request') : _('Cherry-pick this commit')
 
-.modal{ id: "modal-#{type}-commit" }
+.modal{ id: "modal-#{type}-commit", tabindex: -1 }
   .modal-dialog
     .modal-content
       .modal-header
diff --git a/changelogs/unreleased/close-revert-and-cherry-pick-modal-on-escape-keypress.yml b/changelogs/unreleased/close-revert-and-cherry-pick-modal-on-escape-keypress.yml
new file mode 100644
index 00000000000..49648cdfcfc
--- /dev/null
+++ b/changelogs/unreleased/close-revert-and-cherry-pick-modal-on-escape-keypress.yml
@@ -0,0 +1,5 @@
+---
+title: Close revert and cherry pick modal on escape keypress
+merge_request: 20341
+author: George Tsiolis
+type: changed
diff --git a/spec/features/merge_request/user_sees_check_out_branch_modal_spec.rb b/spec/features/merge_request/user_sees_check_out_branch_modal_spec.rb
index c40c720d168..86086a58f18 100644
--- a/spec/features/merge_request/user_sees_check_out_branch_modal_spec.rb
+++ b/spec/features/merge_request/user_sees_check_out_branch_modal_spec.rb
@@ -1,6 +1,6 @@
 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(:user) { project.creator }
   let(:merge_request) { create(:merge_request, source_project: project) }
@@ -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 model 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')
diff --git a/spec/features/merge_request/user_cherry_picks_spec.rb b/spec/features/merge_request/user_sees_cherry_pick_modal_spec.rb
index c6ec3f08cc5..aa499493dbe 100644
--- a/spec/features/merge_request/user_cherry_picks_spec.rb
+++ b/spec/features/merge_request/user_sees_cherry_pick_modal_spec.rb
@@ -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
diff --git a/spec/features/user_sees_revert_modal_spec.rb b/spec/features/user_sees_revert_modal_spec.rb
new file mode 100644
index 00000000000..11a9e470f76
--- /dev/null
+++ b/spec/features/user_sees_revert_modal_spec.rb
@@ -0,0 +1,25 @@
+require 'rails_helper'
+
+describe 'Merge request > User sees revert 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('Revert')
+  end
+
+  it 'shows the revert modal' do
+    expect(page).to have_content('Revert this merge request')
+  end
+
+  it 'closes the revert modal with escape keypress' do
+    find('#modal-revert-commit').send_keys(:escape)
+
+    expect(page).not_to have_content('Revert this merge request')
+  end
+end