github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-22 19:21:34 +08:00
Code Issues Actions 1 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");
});