Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 12 insertions, 1 deletions

diff --git a/spec/controllers/profiles_controller_spec.rb b/spec/controllers/profiles_controller_spec.rb
index 7a72a13febe..37a633afab4 100644
--- a/spec/controllers/profiles_controller_spec.rb
+++ b/spec/controllers/profiles_controller_spec.rb
@@ -100,6 +100,16 @@ RSpec.describe ProfilesController, :request_store do
       expect(user.reload.job_title).to eq(title)
       expect(response).to have_gitlab_http_status(:found)
     end
+
+    it 'allows updating user specified pronouns', :aggregate_failures do
+      pronouns = 'they/them'
+      sign_in(user)
+
+      put :update, params: { user: { pronouns: pronouns } }
+
+      expect(user.reload.pronouns).to eq(pronouns)
+      expect(response).to have_gitlab_http_status(:found)
+    end
   end
 
   describe 'GET audit_log' do
@@ -110,7 +120,8 @@ RSpec.describe ProfilesController, :request_store do
 
       expect_snowplow_event(
         category: 'ProfilesController',
-        action: 'search_audit_event'
+        action: 'search_audit_event',
+        user: user
       )
     end
   end