From 6a2bde4d48bef77bc439c02b3b0dde0fcff1e381 Mon Sep 17 00:00:00 2001 From: Martin Brennan Date: Fri, 21 Feb 2020 10:01:32 +1000 Subject: [PATCH] Fix broken secure media specs --- spec/jobs/regular/update_private_uploads_acl_spec.rb | 1 + spec/models/post_spec.rb | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/spec/jobs/regular/update_private_uploads_acl_spec.rb b/spec/jobs/regular/update_private_uploads_acl_spec.rb index d80713d632..25d6fe07d0 100644 --- a/spec/jobs/regular/update_private_uploads_acl_spec.rb +++ b/spec/jobs/regular/update_private_uploads_acl_spec.rb @@ -26,6 +26,7 @@ describe Jobs::UpdatePrivateUploadsAcl do SiteSetting.prevent_anons_from_downloading_files = true SiteSetting::Upload.stubs(:enable_s3_uploads).returns(true) Discourse.stubs(:store).returns(stub(external?: false)) + SiteSetting.stubs(:secure_media?).returns(true) end it "changes the upload to secure" do diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb index 2001a996e3..b7a97d7d2e 100644 --- a/spec/models/post_spec.rb +++ b/spec/models/post_spec.rb @@ -1440,13 +1440,15 @@ describe Post do it "marks attachments as secure when relevant setting is enabled" do SiteSetting.prevent_anons_from_downloading_files = true - post = Fabricate(:post, raw: raw, user: user, topic: Fabricate(:topic, user: user)) + SiteSetting.secure_media = true + private_category = Fabricate(:private_category, group: Fabricate(:group)) + post = Fabricate(:post, raw: raw, user: user, topic: Fabricate(:topic, user: user, category: private_category)) post.link_post_uploads post.update_uploads_secure_status expect(PostUpload.where(post: post).joins(:upload).pluck(:upload_id, :secure)).to contain_exactly( [attachment_upload.id, true], - [image_upload.id, false] + [image_upload.id, true] ) end