diff options
author | Reverite <github@reverite.sh> | 2019-05-15 11:12:17 -0700 |
---|---|---|
committer | Reverite <github@reverite.sh> | 2019-05-15 11:12:17 -0700 |
commit | 4cea89bf2e9ce7f73fccfc637191b1e039ad25ee (patch) | |
tree | cc559ad868e13d934ff539bd2da836ddad3ea5fc /spec/models/concerns | |
parent | cdb159f27e2aeb2cf3bb184ac20b7056b013f714 (diff) | |
parent | c1cf8c1636e0a639cced585f0cb234547a64d417 (diff) |
Merge branch 'glitch' into production
Diffstat (limited to 'spec/models/concerns')
-rw-r--r-- | spec/models/concerns/status_threading_concern_spec.rb | 4 |
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 |