nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix user controller spec

Browse source
This commit is contained in:
Sarah Mei 2011-11-04 22:06:56 -07:00
parent c65bf16c8e
commit d17ecd6101
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/users_controller.rb
View file

@ -80,7 +80,7 @@ class UsersController < ApplicationController
end
def destroy
if params[:user][:current_password] && current_user.valid_password?(params[:user][:current_password])
if params[:user] && params[:user][:current_password] && current_user.valid_password?(params[:user][:current_password])
Resque.enqueue(Jobs::DeleteAccount, current_user.id)
current_user.lock_access!
sign_out current_user

6
spec/controllers/users_controller_spec.rb
View file

@ -189,16 +189,16 @@ describe UsersController do
describe '#destroy' do
it 'does nothing if the password does not match' do
Resque.should_not_receive(:enqueue)
delete :destroy, :password => "stuff"
delete :destroy, :user => { :current_password => "stuff" }
end
it 'enqueues a delete job' do
Resque.should_receive(:enqueue).with(Jobs::DeleteAccount, alice.id)
delete :destroy, :password => "bluepin7"
delete :destroy, :user => { :current_password => "bluepin7" }
end
it 'locks the user out' do
delete :destroy, :password => "bluepin7"
delete :destroy, :user => { :current_password => "bluepin7" }
alice.reload.access_locked?.should be_true
end
end