about summary refs log tree commit diff
path: root/spec/models
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-01-25 12:23:47 +0100
committerGitHub <noreply@github.com>2020-01-25 12:23:47 +0100
commit340cb4a04c94f9403673d59e552be909fce25ece (patch)
tree6b5f1b95e8b8bd9dcdbad167e3f74097a6bea3c6 /spec/models
parent0be67df4f0a64367d9e376b06bd3fd2fb9ca8195 (diff)
parent4e1efacfac29cbd4ba3ff675abaa923bb53fcbc8 (diff)
Merge pull request #1266 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/user_spec.rb15
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