diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-01-25 10:04:41 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-25 10:04:41 +0100 |
commit | 61f699c0e907d8525190b115fc619296b4affa98 (patch) | |
tree | 9ed5cc5b4260565bebab4482b3266b911204fa79 /spec/models | |
parent | 0be67df4f0a64367d9e376b06bd3fd2fb9ca8195 (diff) | |
parent | f816da9c6474ddf437681fbf7f5346672436ccdf (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/user_spec.rb | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index d7c0b5359..5686ec909 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -322,20 +322,7 @@ RSpec.describe User, type: :model do end it 'disables user' do - expect(user).to have_attributes(disabled: true, current_sign_in_at: nil, last_sign_in_at: current_sign_in_at) - end - end - - describe '#disable!' do - subject(:user) { Fabricate(:user, disabled: false, current_sign_in_at: current_sign_in_at, last_sign_in_at: nil) } - let(:current_sign_in_at) { Time.zone.now } - - before do - user.disable! - end - - it 'disables user' do - expect(user).to have_attributes(disabled: true, current_sign_in_at: nil, last_sign_in_at: current_sign_in_at) + expect(user).to have_attributes(disabled: true) end end |