From fb39a1e16d46560389cb9c3c4e1f1967fb288bbd Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Fri, 9 Dec 2011 17:51:29 -0800 Subject: [PATCH] fix account deletion specs --- app/models/account_deletion.rb | 6 ++---- spec/controllers/users_controller_spec.rb | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/models/account_deletion.rb b/app/models/account_deletion.rb index 9bd2a9e3b..ee99a00bb 100644 --- a/app/models/account_deletion.rb +++ b/app/models/account_deletion.rb @@ -13,7 +13,7 @@ class AccountDeletion < ActiveRecord::Base attr_accessible :person xml_name :account_deletion - xml_attr :diaspora_handle + xml_attr :diaspora_handle def person=(person) self[:diaspora_handle] = person.diaspora_handle @@ -25,12 +25,10 @@ class AccountDeletion < ActiveRecord::Base self[:person_id] ||= Person.find_by_diaspora_handle(diaspora_handle).id end - - def queue_delete_account Resque.enqueue(Jobs::DeleteAccount, self.id) end - + def perform! self.dispatch if person.local? AccountDeleter.new(self.diaspora_handle).perform! diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 1f47f3c70..554ccea0e 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -199,7 +199,7 @@ describe UsersController do end it 'enqueues a delete job' do - Resque.should_receive(:enqueue).with(Jobs::DeleteAccount, alice.id) + Resque.should_receive(:enqueue).with(Jobs::DeleteAccount, anything) delete :destroy, :user => { :current_password => "bluepin7" } end