about summary refs log tree commit diff
path: root/spec/models
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-05-15 17:11:40 +0200
committerThibaut Girka <thib@sitedethib.com>2019-05-15 17:11:40 +0200
commit6badf2d252a980d496b894c7258a778c57639953 (patch)
treeb7c71885c413a8205dbe9d01bab7c60ea75c11bf /spec/models
parentcd534830adab89300703904ffe87894dec8e2f95 (diff)
parentf4f22391b2d469bd1d5c29ec815daf020282f30c (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/concerns/status_threading_concern_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/concerns/status_threading_concern_spec.rb b/spec/models/concerns/status_threading_concern_spec.rb
index 94c2d5fc2..50286ef77 100644
--- a/spec/models/concerns/status_threading_concern_spec.rb
+++ b/spec/models/concerns/status_threading_concern_spec.rb
@@ -35,7 +35,7 @@ describe StatusThreadingConcern do
     end
 
     it 'does not return conversation history from silenced and not followed users' do
-      jeff.update(silenced: true)
+      jeff.silence!
       expect(reply3.ancestors(4, viewer)).to_not include(reply1)
     end
 
@@ -110,7 +110,7 @@ describe StatusThreadingConcern do
     end
 
     it 'does not return replies from silenced and not followed users' do
-      jeff.update(silenced: true)
+      jeff.silence!
       expect(status.descendants(4, viewer)).to_not include(reply3)
     end