Add latest changes from gitlab-org/gitlab@13-1-stable-ee

1 files changed, 10 insertions, 1 deletions

diff --git a/spec/features/profiles/user_edit_profile_spec.rb b/spec/features/profiles/user_edit_profile_spec.rb
index 171dfb353f0..2659157d61d 100644
--- a/spec/features/profiles/user_edit_profile_spec.rb
+++ b/spec/features/profiles/user_edit_profile_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User edit profile' do
+RSpec.describe 'User edit profile' do
   let(:user) { create(:user) }
 
   before do
@@ -245,6 +245,15 @@ describe 'User edit profile' do
         end
       end
 
+      it 'opens the emoji modal again after closing it' do
+        open_user_status_modal
+        select_emoji('biohazard', true)
+
+        find('.js-toggle-emoji-menu').click
+
+        expect(page).to have_selector('.emoji-menu')
+      end
+
       it 'does not update the awards panel emoji' do
         project.add_maintainer(user)
         visit(project_issue_path(project, issue))