github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 22:43:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: consistent and future-proof upload storage pattern

Browse Source
This commit is contained in:
Régis Hanol
2015-05-19 12:31:12 +02:00
parent 666b5b40a5
commit 9ded21e4c6
10 changed files with 28 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spec/controllers/uploads_controller_spec.rb
View File

@ -54,8 +54,7 @@ describe UploadsController do
it 'correctly sets retain_hours for admins' do
log_in :admin
xhr :post, :create, file: logo, retain_hours: 100
url = JSON.parse(response.body)["url"]
id = url.split("/")[3].to_i
id = JSON.parse(response.body)["id"]
expect(Upload.find(id).retain_hours).to eq(100)
end
@ -121,30 +120,33 @@ describe UploadsController do
context '.show' do
let(:site) { "default" }
let(:sha) { Digest::SHA1.hexdigest("discourse") }
it "returns 404 when using external storage" do
store = stub(internal?: false)
Discourse.stubs(:store).returns(store)
Upload.expects(:find_by).never
get :show, site: "default", id: 1, sha: "1234567890abcdef", extension: "pdf"
get :show, site: site, sha: sha, extension: "pdf"
expect(response.response_code).to eq(404)
end
it "returns 404 when the upload doens't exist" do
Upload.expects(:find_by).with(id: 2, url: "/uploads/default/2/1234567890abcdef.pdf").returns(nil)
Upload.expects(:find_by).with(sha1: "1234567890abcdef").returns(nil)
Upload.expects(:find_by).with(sha1: sha).returns(nil)
get :show, site: "default", id: 2, sha: "1234567890abcdef", extension: "pdf"
get :show, site: site, sha: sha, extension: "pdf"
expect(response.response_code).to eq(404)
end
it 'uses send_file' do
upload = build(:upload)
Upload.expects(:find_by).with(id: 42, url: "/uploads/default/42/66b3ed1503efc936.zip").returns(upload)
Upload.expects(:find_by).with(sha1: sha).returns(upload)
controller.stubs(:render)
controller.expects(:send_file)
get :show, site: "default", id: 42, sha: "66b3ed1503efc936", extension: "zip"
get :show, site: site, sha: sha, extension: "zip"
end
context "prevent anons from downloading files" do
@ -153,7 +155,8 @@ describe UploadsController do
it "returns 404 when an anonymous user tries to download a file" do
Upload.expects(:find_by).never
get :show, site: "default", id: 2, sha: "1234567890abcdef", extension: "pdf"
get :show, site: site, sha: sha, extension: "pdf"
expect(response.response_code).to eq(404)
end