about summary refs log tree commit diff
path: root/spec/models/concerns/status_threading_concern_spec.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-05-15 18:44:21 +0200
committerGitHub <noreply@github.com>2019-05-15 18:44:21 +0200
commitc1cf8c1636e0a639cced585f0cb234547a64d417 (patch)
tree77b40e8bb0b1682bebaebebfa32d135ba406ac14 /spec/models/concerns/status_threading_concern_spec.rb
parent4bab7d7640a72ffeb04c104a93ad6d3d5700c712 (diff)
parent6badf2d252a980d496b894c7258a778c57639953 (diff)
Merge pull request #1049 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/models/concerns/status_threading_concern_spec.rb')
-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