Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2026-02-18 18:40:03 +01:00
parent 7b4c22214a 3df8fb8fe9
commit b041869887
155 changed files with 1306 additions and 785 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spec/controllers/settings/two_factor_authentication/otp_authentication_controller_spec.rb
View File

@@ -63,7 +63,7 @@ RSpec.describe Settings::TwoFactorAuthentication::OtpAuthenticationController do
expect do
post :create, session: { challenge_passed_at: Time.now.utc }
end.to not_change { user.reload.otp_secret }
.and(change { session[:new_otp_secret] })
.and(change { session[:new_otp_secret] })
expect(response).to redirect_to(new_settings_two_factor_authentication_confirmation_path)
end
@@ -80,7 +80,7 @@ RSpec.describe Settings::TwoFactorAuthentication::OtpAuthenticationController do
expect do
post :create, session: { challenge_passed_at: Time.now.utc }
end.to not_change { user.reload.otp_secret }
.and(change { session[:new_otp_secret] })
.and(change { session[:new_otp_secret] })
expect(response).to redirect_to(new_settings_two_factor_authentication_confirmation_path)
end

2
spec/controllers/settings/two_factor_authentication/webauthn_credentials_controller_spec.rb
View File

@@ -200,7 +200,7 @@ RSpec.describe Settings::TwoFactorAuthentication::WebauthnCredentialsController
expect do
post :create, params: { credential: new_webauthn_credential, nickname: nickname }
end.to change { user.webauthn_credentials.count }.by(1)
.and not_change(user, :webauthn_id)
.and not_change(user, :webauthn_id)
expect(response).to have_http_status(200)
end