Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream

spec/policies/admin/status_policy_spec.rb

@@ -7,7 +7,8 @@ describe Admin::StatusPolicy do
   let(:policy) { described_class }
   let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:account) }
-  let(:status) { Fabricate(:status) }
+  let(:status) { Fabricate(:status, visibility: status_visibility) }
+  let(:status_visibility) { :public }
 
   permissions :index?, :update?, :review?, :destroy? do
     context 'with an admin' do
@@ -26,7 +27,7 @@ describe Admin::StatusPolicy do
   permissions :show? do
     context 'with an admin' do
       context 'with a public visible status' do
-        before { allow(status).to receive(:public_visibility?).and_return(true) }
+        let(:status_visibility) { :public }
 
         it 'permits' do
           expect(policy).to permit(admin, status)
@@ -34,11 +35,21 @@ describe Admin::StatusPolicy do
       end
 
       context 'with a not public visible status' do
-        before { allow(status).to receive(:public_visibility?).and_return(false) }
+        let(:status_visibility) { :direct }
 
         it 'denies' do
           expect(policy).to_not permit(admin, status)
         end
+
+        context 'when the status mentions the admin' do
+          before do
+            status.mentions.create!(account: admin)
+          end
+
+          it 'permits' do
+            expect(policy).to permit(admin, status)
+          end
+        end
       end
     end