about summary refs log tree commit diff
path: root/spec/models/status_spec.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-08-22 21:35:07 +0200
committerGitHub <noreply@github.com>2018-08-22 21:35:07 +0200
commit8aa58e34bb2b62192a997ac7ea8919b22fc45f80 (patch)
treeabc0ea9862c55c2e114c855b20eb4a35f1141709 /spec/models/status_spec.rb
parent628fca50e20bcf41f206877083fc5ee8789c1088 (diff)
parente70fc059a9511d43b42c2502514f6220b416cdd5 (diff)
Merge pull request #665 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/models/status_spec.rb')
-rw-r--r--spec/models/status_spec.rb11
1 files changed, 0 insertions, 11 deletions
diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb
index 3467342ee..512dc258e 100644
--- a/spec/models/status_spec.rb
+++ b/spec/models/status_spec.rb
@@ -610,17 +610,6 @@ RSpec.describe Status, type: :model do
           expect(results).to include(es_status)
         end
       end
-
-      context 'where that account is silenced' do
-        it 'includes statuses from other accounts that are silenced' do
-          @account.update(silenced: true)
-          other_silenced_account = Fabricate(:account, silenced: true)
-          other_status = Fabricate(:status, account: other_silenced_account)
-
-          results = Status.as_public_timeline(@account)
-          expect(results).to include(other_status)
-        end
-      end
     end
 
     context 'with local-only statuses' do