IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

BUGFIX: support CDN for avatars

Browse Source 
Correct broken spec
Implement S3 support
This commit is contained in:
Sam Saffron
2014-05-27 14:40:46 +10:00
parent 330ea82ce4
commit 252e93d0f2
5 changed files with 58 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
test/javascripts/controllers/avatar_selector_controller_test.js
View File

@@ -1,28 +1,25 @@
var avatarSelector = Em.Object.create({
use_uploaded_avatar: false,
gravatar_template: "//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon",
uploaded_avatar_template: "//cdn.discourse.org/uploads/meta_discourse/avatars/093/607/185cff113e/{size}.jpg"
});
module("controller:avatar-selector");
test("avatarTemplate", function() {
var avatarSelectorController = controllerFor('avatar-selector');
avatarSelectorController.setProperties(avatarSelector);
avatarSelectorController.setProperties({
selected: "system",
system_avatar_upload_id:1,
gravatar_avatar_upload_id:2,
custom_avatar_upload_id: 3
});
equal(avatarSelectorController.get("avatarTemplate"),
avatarSelector.get("gravatar_template"),
"we are using gravatar by default");
equal(avatarSelectorController.get("selectedUploadId"), 1,
"we are using system by default");
avatarSelectorController.send('useUploadedAvatar');
avatarSelectorController.set('selected', 'gravatar');
equal(avatarSelectorController.get("avatarTemplate"),
avatarSelector.get("uploaded_avatar_template"),
"calling useUploadedAvatar switches to using the uploaded avatar");
equal(avatarSelectorController.get("selectedUploadId"), 2,
"we are using gravatar when set");
avatarSelectorController.send('useGravatar');
avatarSelectorController.set("selected", "custom");
equal(avatarSelectorController.get("selectedUploadId"), 3,
"we are using custom when set");
equal(avatarSelectorController.get("avatarTemplate"),
avatarSelector.get("gravatar_template"),
"calling useGravatar switches to using gravatar");
});

15
test/javascripts/lib/utilities_test.js
View File

@@ -111,26 +111,31 @@ test("isAnImage", function() {
test("avatarUrl", function() {
blank(Discourse.Utilities.avatarUrl('', 'tiny'), "no template returns blank");
equal(Discourse.Utilities.avatarUrl('/fake/template/{size}.png', 'tiny'), "/fake/template/20.png", "simple avatar url");
equal(Discourse.Utilities.avatarUrl('/fake/template/{size}.png', 'large'), "/fake/template/45.png", "different size");
equal(Discourse.Utilities.avatarUrl('/fake/template/{size}.png', 'tiny'), "/fake/template/" + 20*window.devicePixelRatio + ".png", "simple avatar url");
equal(Discourse.Utilities.avatarUrl('/fake/template/{size}.png', 'large'), "/fake/template/" + 45*window.devicePixelRatio + ".png", "different size");
});
test("avatarImg", function() {
var oldRatio = window.devicePixelRatio;
window.devicePixelRatio = 2;
var avatarTemplate = "/path/to/avatar/{size}.png";
equal(Discourse.Utilities.avatarImg({avatarTemplate: avatarTemplate, size: 'tiny'}),
"<img width='20' height='20' src='/path/to/avatar/20.png' class='avatar'>",
"<img width='20' height='20' src='/path/to/avatar/40.png' class='avatar'>",
"it returns the avatar html");
equal(Discourse.Utilities.avatarImg({avatarTemplate: avatarTemplate, size: 'tiny', title: 'evilest trout'}),
"<img width='20' height='20' src='/path/to/avatar/20.png' class='avatar' title='evilest trout'>",
"<img width='20' height='20' src='/path/to/avatar/40.png' class='avatar' title='evilest trout'>",
"it adds a title if supplied");
equal(Discourse.Utilities.avatarImg({avatarTemplate: avatarTemplate, size: 'tiny', extraClasses: 'evil fish'}),
"<img width='20' height='20' src='/path/to/avatar/20.png' class='avatar evil fish'>",
"<img width='20' height='20' src='/path/to/avatar/40.png' class='avatar evil fish'>",
"it adds extra classes if supplied");
blank(Discourse.Utilities.avatarImg({avatarTemplate: "", size: 'tiny'}),
"it doesn't render avatars for invalid avatar template");
window.devicePixelRatio = oldRatio;
});
test("defaultHomepage", function() {

8
test/javascripts/models/user_test.js
View File

@@ -25,3 +25,11 @@ test("isAllowedToUploadAFile", function() {
user.setProperties({ admin: false, moderator: true });
ok(user.isAllowedToUploadAFile("image"), "moderator can always upload a file");
});
test("avatarTemplate", function(){
var oldCDN = Discourse.CDN;
equal(Discourse.avatarTemplate("sam", 1), "/user_avatar/sam/{size}/1.png");
Discourse.CDN = "http://awesome.cdn.com";
equal(Discourse.avatarTemplate("sam", 1), "http://awesome.cdn.com/user_avatar/sam/{size}/1.png");
var Discourse.CDN = oldCDN;
});