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

FIX: redirect to CDN avatar for s3 avatars

Browse Source
This commit is contained in:
Sam
2015-05-27 12:02:57 +10:00
parent 0a2a248acc
commit a988cd5abe
4 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spec/controllers/user_avatars_controller_spec.rb
View File

@ -3,23 +3,34 @@ require 'spec_helper'
describe UserAvatarsController do
context 'show' do
it 'redirects to correct size for non local' do
it 'handles non local content correctly' do
SiteSetting.avatar_sizes = "100|49"
SiteSetting.enable_s3_uploads = true
SiteSetting.s3_access_key_id = "XXX"
SiteSetting.s3_secret_access_key = "XXX"
SiteSetting.s3_upload_bucket = "test"
SiteSetting.s3_cdn_url = "http://cdn.com"
GlobalSetting.expects(:cdn_url).returns("http://awesome.com/boom")
upload = Fabricate(:upload)
upload = Fabricate(:upload, url: "//test.s3-#{SiteSetting.s3_region}.amazonaws.com/something")
Fabricate(:optimized_image,
sha1: SecureRandom.hex << "A"*8,
upload: upload,
width: 98,
height: 98,
url: "//test.s3-#{SiteSetting.s3_region}.amazonaws.com/something/else")
user = Fabricate(:user, uploaded_avatar_id: upload.id)
get :show, size: 97, username: user.username, version: upload.id, hostname: 'default'
# 98 is closese which is 49 * 2 for retina
expect(response).to redirect_to("http://awesome.com/boom/user_avatar/default/#{user.username_lower}/98/#{upload.id}.png")
get :show, size: 98, username: user.username, version: upload.id, hostname: 'default'
expect(response).to redirect_to("http://cdn.com/something/else")
end
it 'serves image even if size missing and its in local mode' do