fixed errror on services inviter action, specs

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

View file

@ -36,7 +36,7 @@ class Invitation < ActiveRecord::Base
if service == 'email'
existing_user ||= User.where(:email => identifier).first
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
existing_user

View file

@ -83,7 +83,7 @@ describe ServicesController do
describe '#finder' do
before do
@service1 = Factory.create(:service, :provider => 'facebook')
@service1 = Services::Facebook.new
@user.services << @service1
end
@ -97,9 +97,8 @@ describe ServicesController do
describe '#invite' do
before do
@service1 = Services::Facebook.create(:provider => 'facebook')
@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
it 'sets the subject' do

View file

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

View file

@ -32,7 +32,7 @@ describe Services::Facebook do
@user2 = Factory.create(:user_with_aspect)
@user2_fb_id = '820651'
@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
@fb_list_hash = <<JSON
{