diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-07-07 15:34:00 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-07 15:58:45 +0200 |
commit | e9ad99bc93b6f65277956d997792ec40f08165cb (patch) | |
tree | ce71714d2d0d680adecf070cb4e698f3a6984b56 /spec/controllers/media_controller_spec.rb | |
parent | 94e09d309cb068ea92919767e40e655260ac43cb (diff) | |
parent | 6e25574ce599cbc37b7215ded03c7d07208af6bb (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `package.json`: Not really a conflict, just some glitch-soc-specific dependency too close to an upstream-updated one.
Diffstat (limited to 'spec/controllers/media_controller_spec.rb')
-rw-r--r-- | spec/controllers/media_controller_spec.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/controllers/media_controller_spec.rb b/spec/controllers/media_controller_spec.rb index ac44a76f2..2925aed59 100644 --- a/spec/controllers/media_controller_spec.rb +++ b/spec/controllers/media_controller_spec.rb @@ -28,9 +28,8 @@ describe MediaController do end it 'raises when not permitted to view' do - status = Fabricate(:status) + status = Fabricate(:status, visibility: :direct) media_attachment = Fabricate(:media_attachment, status: status) - allow_any_instance_of(MediaController).to receive(:authorize).and_raise(ActiveRecord::RecordNotFound) get :show, params: { id: media_attachment.to_param } expect(response).to have_http_status(404) |