Add spec for closing cherry-pick modal on escape keypress

4 files changed, 34 insertions, 4 deletions

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..07acd3f8f72 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/user_sees_cherry_pick_modal_spec.rb b/spec/features/user_sees_cherry_pick_modal_spec.rb
new file mode 100644
index 00000000000..9e4058e0a2a
--- /dev/null
+++ b/spec/features/user_sees_cherry_pick_modal_spec.rb
@@ -0,0 +1,25 @@
+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
diff --git a/spec/features/user_sees_revert_modal_spec.rb b/spec/features/user_sees_revert_modal_spec.rb
index 22a321a4338..11a9e470f76 100644
--- a/spec/features/user_sees_revert_modal_spec.rb
+++ b/spec/features/user_sees_revert_modal_spec.rb
@@ -1,13 +1,13 @@
 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(: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)
+    visit(project_merge_request_path(project, merge_request))
     click_button('Merge')
     visit(merge_request_path(merge_request))
     click_link('Revert')