github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-03 19:39:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix the build - take 2

Browse Source
This commit is contained in:
Régis Hanol
2015-09-11 15:47:48 +02:00
parent 29f25dbf6e
commit 18d7c1c75d
3 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spec/controllers/users_controller_spec.rb
View File

@ -1301,7 +1301,7 @@ describe UsersController do
describe '.pick_avatar' do
it 'raises an error when not logged in' do
expect { xhr :put, :pick_avatar, username: 'asdf', avatar_id: 1}.to raise_error(Discourse::NotLoggedIn)
expect { xhr :put, :pick_avatar, username: 'asdf', avatar_id: 1, type: "custom"}.to raise_error(Discourse::NotLoggedIn)
end
context 'while logged in' do
@ -1310,12 +1310,12 @@ describe UsersController do
it 'raises an error when you don\'t have permission to toggle the avatar' do
another_user = Fabricate(:user)
xhr :put, :pick_avatar, username: another_user.username, upload_id: 1
xhr :put, :pick_avatar, username: another_user.username, upload_id: 1, type: "custom"
expect(response).to be_forbidden
end
it 'it successful' do
xhr :put, :pick_avatar, username: user.username, upload_id: 111
xhr :put, :pick_avatar, username: user.username, upload_id: 111, type: "custom"
expect(user.reload.uploaded_avatar_id).to eq(111)
expect(user.user_avatar.reload.custom_upload_id).to eq(111)
expect(response).to be_success
@ -1326,13 +1326,6 @@ describe UsersController do
expect(response).to be_success
end
it 'returns success' do
xhr :put, :pick_avatar, username: user.username, upload_id: 111
expect(user.reload.uploaded_avatar_id).to eq(111)
expect(response).to be_success
json = ::JSON.parse(response.body)
expect(json['success']).to eq("OK")
end
end
end