From 07850c7cb22a16e315f2a174ea81ae79dbb2d9a5 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Fri, 28 Jan 2011 17:13:20 -0800
Subject: [PATCH] fix fb finder, flesh out test
---
app/views/services/finder.html.haml | 2 +-
spec/controllers/services_controller_spec.rb | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/app/views/services/finder.html.haml b/app/views/services/finder.html.haml
index 6208f8b7e2..f26e73375c 100644
--- a/app/views/services/finder.html.haml
+++ b/app/views/services/finder.html.haml
@@ -21,7 +21,7 @@
= search_field_tag :contact_search, "", :class => 'contact_list_search', :results => 5, :placeholder => t('shared.contact_list.all_contacts')
%ul
- for uid in @friends.keys
- = render :partial => 'remote_friend', :friend => @friends[uid], :uid => uid
+ = render :partial => 'remote_friend', :locals => {:friend => @friends[uid], :uid => uid}
- else
%br
%br
diff --git a/spec/controllers/services_controller_spec.rb b/spec/controllers/services_controller_spec.rb
index bd10561b1e..a6edf97f32 100644
--- a/spec/controllers/services_controller_spec.rb
+++ b/spec/controllers/services_controller_spec.rb
@@ -85,17 +85,18 @@ describe ServicesController do
before do
@service1 = Services::Facebook.new
@user.services << @service1
+ @person = Factory(:person)
end
it 'calls the finder method for the service for that user' do
@user.services.stub!(:where).and_return([@service1])
- @service1.should_receive(:finder).and_return({})
+ @service1.should_receive(:finder).and_return("facebook_id" => {:contact => @user.contact_for(bob.person), :name => "Robert Bobson", :person => bob.person})
get :finder, :provider => @service1.provider
end
end
describe '#invite' do
-
+
before do
@uid = "abc"
@invite_params = {:provider => 'facebook', :uid => @uid, :aspect_id => @user.aspects.first.id}
@@ -111,7 +112,7 @@ describe ServicesController do
assigns[:message].should include(User.last.invitation_token)
end
- it 'redirects to a prefilled facebook message url' do
+ it 'redirects to a prefilled facebook message url' do
put :inviter, @invite_params
response.location.should match(/https:\/\/www\.facebook\.com\/\?compose=1&id=.*&subject=.*&message=.*&sk=messages/)
end
--
GitLab