diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /spec/controllers/registrations_controller_spec.rb | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'spec/controllers/registrations_controller_spec.rb')
-rw-r--r-- | spec/controllers/registrations_controller_spec.rb | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/spec/controllers/registrations_controller_spec.rb b/spec/controllers/registrations_controller_spec.rb index ff73c0aafe8..81486c310d4 100644 --- a/spec/controllers/registrations_controller_spec.rb +++ b/spec/controllers/registrations_controller_spec.rb @@ -434,6 +434,18 @@ RSpec.describe RegistrationsController do expect(User.last.last_name).to eq(base_user_params[:last_name]) expect(User.last.name).to eq("#{base_user_params[:first_name]} #{base_user_params[:last_name]}") end + + it 'sets the username and caller_id in the context' do + expect(controller).to receive(:create).and_wrap_original do |m, *args| + m.call(*args) + + expect(Gitlab::ApplicationContext.current) + .to include('meta.user' => base_user_params[:username], + 'meta.caller_id' => 'RegistrationsController#create') + end + + subject + end end describe '#destroy' do @@ -525,5 +537,17 @@ RSpec.describe RegistrationsController do end end end + + it 'sets the username and caller_id in the context' do + expect(controller).to receive(:destroy).and_wrap_original do |m, *args| + m.call(*args) + + expect(Gitlab::ApplicationContext.current) + .to include('meta.user' => user.username, + 'meta.caller_id' => 'RegistrationsController#destroy') + end + + post :destroy + end end end |