Leatherface/mastodon
1
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

Do not prepare returning user for unpersisted records (#38136)

Browse Source
This commit is contained in:
Matt Jankowski
2026-03-10 12:37:59 -04:00
committed by GitHub
parent 3b6d94ce62
commit 64629eadb7
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/user.rb
View File

@@ -209,8 +209,10 @@ class User < ApplicationRecord
increment(:sign_in_count) if new_sign_in increment(:sign_in_count) if new_sign_in
save(validate: false) unless new_record? unless new_record?
prepare_returning_user! save(validate: false)
prepare_returning_user!
end
end end
def pending? def pending?

4
spec/models/user_spec.rb
View File

@@ -208,9 +208,13 @@ RSpec.describe User do
context 'with a new user' do context 'with a new user' do
let(:user) { Fabricate.build :user } let(:user) { Fabricate.build :user }
before { allow(ActivityTracker).to receive(:record) }
it 'does not persist the user' do it 'does not persist the user' do
expect { user.update_sign_in! } expect { user.update_sign_in! }
.to_not change(user, :persisted?).from(false) .to_not change(user, :persisted?).from(false)
expect(ActivityTracker)
.to_not have_received(:record).with('activity:logins', anything)
end end
end end
end end