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

FIX: s3 endpoint when using 'us-east-1' region

Browse Source
This commit is contained in:
Régis Hanol
2015-05-27 17:50:49 +02:00
parent 5de9554510
commit 83d2b59fc3
3 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spec/controllers/user_avatars_controller_spec.rb
View File

@ -14,19 +14,19 @@ describe UserAvatarsController do
GlobalSetting.expects(:cdn_url).returns("http://awesome.com/boom")
upload = Fabricate(:upload, url: "//test.s3-#{SiteSetting.s3_region}.amazonaws.com/something")
upload = Fabricate(:upload, url: "//test.s3.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")
url: "//test.s3.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
# 98 is closest 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'