diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 13:37:47 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 13:37:47 +0000 |
commit | aee0a117a889461ce8ced6fcf73207fe017f1d99 (patch) | |
tree | 891d9ef189227a8445d83f35c1b0fc99573f4380 /spec/models/u2f_registration_spec.rb | |
parent | 8d46af3258650d305f53b819eabf7ab18d22f59e (diff) | |
download | gitlab-ce-aee0a117a889461ce8ced6fcf73207fe017f1d99.tar.gz |
Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42
Diffstat (limited to 'spec/models/u2f_registration_spec.rb')
-rw-r--r-- | spec/models/u2f_registration_spec.rb | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/spec/models/u2f_registration_spec.rb b/spec/models/u2f_registration_spec.rb index 7a70cf69566..6bb9ccfcf35 100644 --- a/spec/models/u2f_registration_spec.rb +++ b/spec/models/u2f_registration_spec.rb @@ -20,9 +20,9 @@ RSpec.describe U2fRegistration do describe '#create_webauthn_registration' do shared_examples_for 'creates webauthn registration' do it 'creates webauthn registration' do - u2f_registration.save! + created_record = u2f_registration - webauthn_registration = WebauthnRegistration.where(u2f_registration_id: u2f_registration.id) + webauthn_registration = WebauthnRegistration.where(u2f_registration_id: created_record.id) expect(webauthn_registration).to exist end end @@ -43,13 +43,16 @@ RSpec.describe U2fRegistration do it 'logs error' do allow(Gitlab::Auth::U2fWebauthnConverter).to receive(:new).and_raise('boom!') - expect(Gitlab::AppJsonLogger).to( - receive(:error).with(a_hash_including(event: 'u2f_migration', - error: 'RuntimeError', - message: 'U2F to WebAuthn conversion failed')) - ) - u2f_registration.save! + allow_next_instance_of(U2fRegistration) do |u2f_registration| + allow(u2f_registration).to receive(:id).and_return(123) + end + + expect(Gitlab::ErrorTracking).to( + receive(:track_exception).with(kind_of(StandardError), + u2f_registration_id: 123)) + + u2f_registration end end end |