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

1 files changed, 12 insertions, 0 deletions

diff --git a/spec/controllers/passwords_controller_spec.rb b/spec/controllers/passwords_controller_spec.rb
index e9883107456..08d68d7cec8 100644
--- a/spec/controllers/passwords_controller_spec.rb
+++ b/spec/controllers/passwords_controller_spec.rb
@@ -77,6 +77,18 @@ RSpec.describe PasswordsController do
           expect(user.password_expires_at).not_to be_nil
         end
       end
+
+      it 'sets the username and caller_id in the context' do
+        expect(controller).to receive(:update).and_wrap_original do |m, *args|
+          m.call(*args)
+
+          expect(Gitlab::ApplicationContext.current)
+            .to include('meta.user' => user.username,
+                        'meta.caller_id' => 'PasswordsController#update')
+        end
+
+        subject
+      end
     end
   end
 end