Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-06 09:10:25 +08:00
Code Packages Activity Actions 11

FIX: Allow shared CDN for s3 and assets

Browse source
This commit is contained in:
Rafael dos Santos Silva 2018-01-12 01:08:15 -02:00
parent dcbaf2f213
commit b9a343afe7
2 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
spec/models/upload_spec.rb
View file

@ -111,6 +111,22 @@ describe Upload do
expect(Upload.get_from_url(URI.join(s3_cdn_url, path).to_s)).to eq(upload)
end
it "should return the right upload when using one CDN for both s3 and assets" do
begin
original_asset_host = Rails.configuration.action_controller.asset_host
cdn_url = 'http://my.cdn.com'
Rails.configuration.action_controller.asset_host = cdn_url
SiteSetting.s3_cdn_url = cdn_url
upload
expect(Upload.get_from_url(
URI.join(cdn_url, path).to_s
)).to eq(upload)
ensure
Rails.configuration.action_controller.asset_host = original_asset_host
end
end
end
end