From 68dc74e0b7a7a45ba83dc86cd484834f6774652a Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Thu, 9 Sep 2010 18:15:30 -0700
Subject: [PATCH] Tests pass again, use id => in retraction.perform

---
 app/models/retraction.rb       |  2 +-
 spec/models/retraction_spec.rb | 10 ++++------
 spec/models/user_spec.rb       |  2 --
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/models/retraction.rb b/app/models/retraction.rb
index afea944f6..3d97db47b 100644
--- a/app/models/retraction.rb
+++ b/app/models/retraction.rb
@@ -30,7 +30,7 @@ class Retraction
     begin
       return unless signature_valid? 
       Rails.logger.debug("Retracting #{self.type} id: #{self.post_id}")
-      target = self.type.constantize.first(self.post_id)
+      target = self.type.constantize.first(:id => self.post_id)
       target.unsocket_from_uid receiving_user_id if target.respond_to? :unsocket_from_uid
       target.destroy
     rescue NameError
diff --git a/spec/models/retraction_spec.rb b/spec/models/retraction_spec.rb
index bb344a039..9b742fae3 100644
--- a/spec/models/retraction_spec.rb
+++ b/spec/models/retraction_spec.rb
@@ -3,10 +3,10 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe Retraction do
     before do
       @user = Factory.create(:user)
-      @post = @user.post :status_message, :message => "Destroy!", :to => @user.group(:name => "losers").id
       @person = Factory.create(:person)
-      @user.friends << @person
-      @user.save
+      @group = @user.group(:name => "Bruisers")
+      @user.activate_friend(@person, @group)
+      @post = @user.post :status_message, :message => "Destroy!", :to => @group.id
     end
   describe 'serialization' do
     it 'should have a post id after serialization' do
@@ -18,10 +18,8 @@ describe Retraction do
   describe 'dispatching' do
     it 'should dispatch a message on delete' do
       Factory.create(:person)
-      message_queue.should_receive(:add_post_request)
+      Salmon::QUEUE.should_receive :add_post_request
       @post.destroy
     end
   end
-
-
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 548966548..54dfe9632 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -12,8 +12,6 @@ describe User do
       
       updated_profile = {:profile => {:first_name => 'bob', :last_name => 'billytown', :image_url => "http://clown.com"}}
       
-      message_queue.should_receive(:process)
-      
       @user.update_profile(updated_profile).should == true
       @user.profile.image_url.should == "http://clown.com"
     end