Merge branch '50521-block-emojis-and-symbol-characters-from-user-s-full-names-2' into 'master'

Resolve "Block emojis and symbol characters from user's full names"

Closes #50521

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

1 files changed, 44 insertions, 19 deletions

diff --git a/spec/features/profiles/user_edit_profile_spec.rb b/spec/features/profiles/user_edit_profile_spec.rb
index f45bcabd196..b43711f6ef6 100644
--- a/spec/features/profiles/user_edit_profile_spec.rb
+++ b/spec/features/profiles/user_edit_profile_spec.rb
@@ -10,6 +10,7 @@ describe 'User edit profile' do
 
   def submit_settings
     click_button 'Update profile settings'
+    wait_for_requests if respond_to?(:wait_for_requests)
   end
 
   it 'changes user profile' do
@@ -35,6 +36,17 @@ describe 'User edit profile' do
     expect(page).to have_content('Profile was successfully updated')
   end
 
+  it 'shows an error if the full name contains an emoji', :js do
+    simulate_input('#user_name', 'Martin 😀')
+    submit_settings
+
+    page.within('.qa-full-name') do
+      expect(page).to have_css '.gl-field-error-outline'
+      expect(find('.gl-field-error')).not_to have_selector('.hidden')
+      expect(find('.gl-field-error')).to have_content('Using emojis in names seems fun, but please try to set a status message instead')
+    end
+  end
+
   context 'user avatar' do
     before do
       attach_file(:user_avatar, Rails.root.join('spec', 'fixtures', 'banana_sample.gif'))
@@ -61,6 +73,11 @@ describe 'User edit profile' do
   end
 
   context 'user status', :js do
+    def visit_user
+      visit user_path(user)
+      wait_for_requests
+    end
+
     def select_emoji(emoji_name, is_modal = false)
       emoji_menu_class = is_modal ? '.js-modal-status-emoji-menu' : '.js-status-emoji-menu'
       toggle_button = find('.js-toggle-emoji-menu')
@@ -71,18 +88,16 @@ describe 'User edit profile' do
 
     context 'profile edit form' do
       it 'shows the user status form' do
-        visit(profile_path)
-
         expect(page).to have_content('Current status')
       end
 
       it 'adds emoji to user status' do
         emoji = 'biohazard'
-        visit(profile_path)
         select_emoji(emoji)
         submit_settings
 
-        visit user_path(user)
+        visit_user
+
         within('.cover-status') do
           expect(page).to have_emoji(emoji)
         end
@@ -90,11 +105,11 @@ describe 'User edit profile' do
 
       it 'adds message to user status' do
         message = 'I have something to say'
-        visit(profile_path)
         fill_in 'js-status-message-field', with: message
         submit_settings
 
-        visit user_path(user)
+        visit_user
+
         within('.cover-status') do
           expect(page).to have_emoji('speech_balloon')
           expect(page).to have_content message
@@ -104,12 +119,12 @@ describe 'User edit profile' do
       it 'adds message and emoji to user status' do
         emoji = 'tanabata_tree'
         message = 'Playing outside'
-        visit(profile_path)
         select_emoji(emoji)
         fill_in 'js-status-message-field', with: message
         submit_settings
 
-        visit user_path(user)
+        visit_user
+
         within('.cover-status') do
           expect(page).to have_emoji(emoji)
           expect(page).to have_content message
@@ -119,7 +134,8 @@ describe 'User edit profile' do
       it 'clears the user status' do
         user_status = create(:user_status, user: user, message: 'Eating bread', emoji: 'stuffed_flatbread')
 
-        visit user_path(user)
+        visit_user
+
         within('.cover-status') do
           expect(page).to have_emoji(user_status.emoji)
           expect(page).to have_content user_status.message
@@ -129,15 +145,13 @@ describe 'User edit profile' do
         click_button 'js-clear-user-status-button'
         submit_settings
 
-        wait_for_requests
+        visit_user
 
-        visit user_path(user)
         expect(page).not_to have_selector '.cover-status'
       end
 
       it 'displays a default emoji if only message is entered' do
         message = 'a status without emoji'
-        visit(profile_path)
         fill_in 'js-status-message-field', with: message
 
         within('.js-toggle-emoji-menu') do
@@ -162,6 +176,7 @@ describe 'User edit profile' do
         page.within "#set-user-status-modal" do
           click_button 'Set status'
         end
+        wait_for_requests
       end
 
       before do
@@ -202,7 +217,8 @@ describe 'User edit profile' do
         select_emoji(emoji, true)
         set_user_status_in_modal
 
-        visit user_path(user)
+        visit_user
+
         within('.cover-status') do
           expect(page).to have_emoji(emoji)
         end
@@ -225,7 +241,8 @@ describe 'User edit profile' do
         find('.js-status-message-field').native.send_keys(message)
         set_user_status_in_modal
 
-        visit user_path(user)
+        visit_user
+
         within('.cover-status') do
           expect(page).to have_emoji('speech_balloon')
           expect(page).to have_content message
@@ -240,7 +257,8 @@ describe 'User edit profile' do
         find('.js-status-message-field').native.send_keys(message)
         set_user_status_in_modal
 
-        visit user_path(user)
+        visit_user
+
         within('.cover-status') do
           expect(page).to have_emoji(emoji)
           expect(page).to have_content message
@@ -250,7 +268,9 @@ describe 'User edit profile' do
       it 'clears the user status with the "X" button' do
         user_status = create(:user_status, user: user, message: 'Eating bread', emoji: 'stuffed_flatbread')
 
-        visit user_path(user)
+        visit_user
+        wait_for_requests
+
         within('.cover-status') do
           expect(page).to have_emoji(user_status.emoji)
           expect(page).to have_content user_status.message
@@ -265,14 +285,18 @@ describe 'User edit profile' do
         find('.js-clear-user-status-button').click
         set_user_status_in_modal
 
-        visit user_path(user)
+        visit_user
+        wait_for_requests
+
         expect(page).not_to have_selector '.cover-status'
       end
 
       it 'clears the user status with the "Remove status" button' do
         user_status = create(:user_status, user: user, message: 'Eating bread', emoji: 'stuffed_flatbread')
 
-        visit user_path(user)
+        visit_user
+        wait_for_requests
+
         within('.cover-status') do
           expect(page).to have_emoji(user_status.emoji)
           expect(page).to have_content user_status.message
@@ -288,7 +312,8 @@ describe 'User edit profile' do
           click_button 'Remove status'
         end
 
-        visit user_path(user)
+        visit_user
+
         expect(page).not_to have_selector '.cover-status'
       end