From 32f08ef345331f192e2f826f96e1ad818d29f41e Mon Sep 17 00:00:00 2001
From: zhitomirskiyi <ilya@joindiaspora.com>
Date: Mon, 21 Mar 2011 14:56:32 -0700
Subject: [PATCH] fixed the nil photo_url and the all being called twice in the
specs
---
spec/controllers/services_controller_spec.rb | 4 ++--
spec/models/services/facebook_spec.rb | 13 ++++++-------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/spec/controllers/services_controller_spec.rb b/spec/controllers/services_controller_spec.rb
index b57fbf17c5..8d952b1c0d 100644
--- a/spec/controllers/services_controller_spec.rb
+++ b/spec/controllers/services_controller_spec.rb
@@ -87,9 +87,9 @@ describe ServicesController do
@user.services << @service1
@person = Factory(:person)
@user.services.stub!(:where).and_return([@service1])
- @hash = [ ServiceUser.create(:contact => @user.contact_for(bob.person), :name => "Robert Bobson", :person => bob.person,
+ @hash = [ ServiceUser.create(:contact => @user.contact_for(bob.person), :name => "Robert Bobson", :photo_url => "cdn1.fb.com/pic1.jpg", :person => bob.person,
:service => @service1, :uid => "321" ),
- ServiceUser.create(:name => "Robert Bobson", :service => @service1, :uid => "dsfasdfas")]
+ ServiceUser.create(:name => "Robert Bobson", :photo_url => "cdn1.fb.com/pic1.jpg", :service => @service1, :uid => "dsfasdfas")]
@service1.should_receive(:finder).and_return(@hash)
end
diff --git a/spec/models/services/facebook_spec.rb b/spec/models/services/facebook_spec.rb
index ae8e152215..423ed582fc 100644
--- a/spec/models/services/facebook_spec.rb
+++ b/spec/models/services/facebook_spec.rb
@@ -58,8 +58,7 @@ JSON
describe '#save_friends' do
it 'requests a friend list' do
- RestClient.should_receive(:get).with("https://graph.facebook.com/me/friends", {:params =>
- {:fields => ['name', 'id', 'picture'], :access_token => @service.access_token}}).and_return(@web_mock)
+ RestClient.should_receive(:get).with("https://graph.facebook.com/me/friends?fields[]=name&fields[]=picture&access_token=yeah").and_return(@web_mock)
@service.save_friends
end
@@ -84,21 +83,21 @@ JSON
context 'opts' do
it 'only local does not return people who are remote' do
@service.save_friends
- @service.finder(:local => true).all.each{|su| su.person.should == @user2.person}
+ @service.finder(:local => true).each{|su| su.person.should == @user2.person}
end
it 'does not return people who are remote' do
@service.save_friends
- @service.finder(:remote => true).all.each{|su| su.person.should be_nil}
+ @service.finder(:remote => true).each{|su| su.person.should be_nil}
end
it 'does not return wrong service objects' do
su2 = ServiceUser.create(:service => @user2_service, :uid => @user2_fb_id, :name => @user2_fb_name, :photo_url => @user2_fb_photo_url)
su2.person.should == @user2.person
- @service.finder(:local => true).all.each{|su| su.service.should == @service}
- @service.finder(:remote => true).all.each{|su| su.service.should == @service}
- @service.finder.all.each{|su| su.service.should == @service}
+ @service.finder(:local => true).each{|su| su.service.should == @service}
+ @service.finder(:remote => true).each{|su| su.service.should == @service}
+ @service.finder.each{|su| su.service.should == @service}
end
end
end
--
GitLab