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

fixed errror on services inviter action, specs

Browse source
This commit is contained in:
zhitomirskiyi 2011-01-27 10:57:58 -08:00
parent a705824b0c
commit 01ce26cbf3
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/invitation.rb
View file

@ -36,7 +36,7 @@ class Invitation < ActiveRecord::Base
if service == 'email' if service == 'email'
existing_user ||= User.where(:email => identifier).first existing_user ||= User.where(:email => identifier).first
else else
existing_user ||= User.joins(:services).where(:services => {:provider => service, :uid => identifier}).first existing_user ||= User.joins(:services).where(:services => {:type => "Services::#{service.titleize}", :uid => identifier}).first
end end
existing_user existing_user

5
spec/controllers/services_controller_spec.rb
View file

@ -83,7 +83,7 @@ describe ServicesController do
describe '#finder' do describe '#finder' do
before do before do
@service1 = Factory.create(:service, :provider => 'facebook') @service1 = Services::Facebook.new
@user.services << @service1 @user.services << @service1
end end
@ -97,9 +97,8 @@ describe ServicesController do
describe '#invite' do describe '#invite' do
before do before do
@service1 = Services::Facebook.create(:provider => 'facebook')
@uid = "abc" @uid = "abc"
@invite_params = {:provider => @service1.provider, :uid => @uid, :aspect_id => @user.aspects.first.id} @invite_params = {:provider => 'facebook', :uid => @uid, :aspect_id => @user.aspects.first.id}
end end
it 'sets the subject' do it 'sets the subject' do

3
spec/models/invitation_spec.rb
View file

@ -92,7 +92,7 @@ describe Invitation do
it 'by service' do it 'by service' do
uid = '123324234' uid = '123324234'
@users[0].services << Services::Facebook.create(:provider => 'facebook', :uid => uid) @users[0].services << Services::Facebook.new(:uid => uid)
@users[0].save @users[0].save
@type = 'facebook' @type = 'facebook'
@ -206,6 +206,7 @@ describe Invitation do
:into => aspect, :into => aspect,
:message => @message} :message => @message}
@invitee = Invitation.create_invitee(:service => 'email', :identifier => @email) @invitee = Invitation.create_invitee(:service => 'email', :identifier => @email)
@valid_params[:existing_user] = @invitee
end end
it 'creates no user' do it 'creates no user' do
@valid_params[:existing_user] = @invitee @valid_params[:existing_user] = @invitee

2
spec/models/services/facebook_spec.rb
View file

@ -32,7 +32,7 @@ describe Services::Facebook do
@user2 = Factory.create(:user_with_aspect) @user2 = Factory.create(:user_with_aspect)
@user2_fb_id = '820651' @user2_fb_id = '820651'
@user2_fb_name = 'Maxwell Salzberg' @user2_fb_name = 'Maxwell Salzberg'
@user2_service = Services::Facebook.create(:uid => @user2_fb_id, :access_token => "yo") @user2_service = Services::Facebook.new(:uid => @user2_fb_id, :access_token => "yo")
@user2.services << @user2_service @user2.services << @user2_service
@fb_list_hash = <<JSON @fb_list_hash = <<JSON
{ {