diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 00:09:16 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 00:09:16 +0000 |
commit | 2e31c85a97183814ffa7ba5cc58f7bbad668fb2b (patch) | |
tree | 18be488a2381014d05dd0323228d00c153251a0f /spec/controllers/sessions_controller_spec.rb | |
parent | 154b9bae142ba15fec753f44327654595094b879 (diff) | |
download | gitlab-ce-2e31c85a97183814ffa7ba5cc58f7bbad668fb2b.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/sessions_controller_spec.rb')
-rw-r--r-- | spec/controllers/sessions_controller_spec.rb | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb index a677e17ab0c..f3e2ea50913 100644 --- a/spec/controllers/sessions_controller_spec.rb +++ b/spec/controllers/sessions_controller_spec.rb @@ -497,13 +497,13 @@ describe SessionsController do end describe '#set_current_context' do + let_it_be(:user) { create(:user) } + before do set_devise_mapping(context: @request) end context 'when signed in' do - let_it_be(:user) { create(:user) } - before do sign_in(user) end @@ -535,5 +535,25 @@ describe SessionsController do get :new end end + + context 'when the user becomes locked' do + before do + user.update!(failed_attempts: User.maximum_attempts.pred) + end + + it 'sets the caller_id in the context' do + allow_any_instance_of(User).to receive(:lock_access!).and_wrap_original do |m, *args| + expect(Labkit::Context.current.to_h) + .to include('meta.caller_id' => 'SessionsController#create') + expect(Labkit::Context.current.to_h) + .not_to include('meta.user') + + m.call(*args) + end + + post(:create, + params: { user: { login: user.username, password: user.password.succ } }) + end + end end end |