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

Fix specs for avatars

Browse Source 
Implement avatar picker
Correct avatar related jobs
This commit is contained in:
Sam
2014-05-26 19:46:43 +10:00
committed by Sam Saffron
parent a864f8aefd
commit 504cfcff96
27 changed files with 228 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
spec/controllers/users_controller_spec.rb
View File

@ -1137,18 +1137,12 @@ describe UsersController do
Upload.expects(:create_for).returns(upload)
# enqueues the user_image generator job
xhr :post, :upload_user_image, username: user.username, file: user_image, user_image_type: "avatar"
user.reload
# erase the previous template
user.uploaded_avatar_template.should == nil
# link to the right upload
user.uploaded_avatar.id.should == upload.id
# automatically set "use_uploaded_user_image"
user.use_uploaded_avatar.should == true
# returns the url, width and height of the uploaded image
json = JSON.parse(response.body)
json['url'].should == "/uploads/default/1/1234567890123456.png"
json['width'].should == 100
json['height'].should == 200
json['upload_id'].should == upload.id
end
it 'is successful for profile backgrounds' do
@ -1194,18 +1188,11 @@ describe UsersController do
Upload.expects(:create_for).returns(upload)
# enqueues the user_image generator job
xhr :post, :upload_avatar, username: user.username, file: user_image_url, user_image_type: "avatar"
user.reload
# erase the previous template
user.uploaded_avatar_template.should == nil
# link to the right upload
user.uploaded_avatar.id.should == upload.id
# automatically set "use_uploaded_user_image"
user.use_uploaded_avatar.should == true
# returns the url, width and height of the uploaded image
json = JSON.parse(response.body)
json['url'].should == "/uploads/default/1/1234567890123456.png"
json['width'].should == 100
json['height'].should == 200
json['upload_id'].should == upload.id
end
it 'is successful for profile backgrounds' do
@ -1234,29 +1221,29 @@ describe UsersController do
end
describe '.toggle_avatar' do
describe '.pick_avatar' do
it 'raises an error when not logged in' do
lambda { xhr :put, :toggle_avatar, username: 'asdf' }.should raise_error(Discourse::NotLoggedIn)
lambda { xhr :put, :pick_avatar, username: 'asdf', avatar_id: 1}.should raise_error(Discourse::NotLoggedIn)
end
context 'while logged in' do
let!(:user) { log_in }
it 'raises an error without a use_uploaded_avatar param' do
lambda { xhr :put, :toggle_avatar, username: user.username }.should raise_error(ActionController::ParameterMissing)
it 'raises an error without an avatar_id param' do
lambda { xhr :put, :pick_avatar, username: user.username }.should raise_error(ActionController::ParameterMissing)
end
it 'raises an error when you don\'t have permission to toggle the avatar' do
Guardian.any_instance.expects(:can_edit?).with(user).returns(false)
xhr :put, :toggle_avatar, username: user.username, use_uploaded_avatar: "true"
another_user = Fabricate(:user)
xhr :put, :pick_avatar, username: another_user.username, upload_id: 1
response.should be_forbidden
end
it 'it successful' do
xhr :put, :toggle_avatar, username: user.username, use_uploaded_avatar: "false"
user.reload.use_uploaded_avatar.should == false
xhr :put, :pick_avatar, username: user.username, upload_id: 111
user.reload.uploaded_avatar_id.should == 111
response.should be_success
end