Skip to content
Extraits de code Groupes Projets
Valider 01ce26cb rédigé par zhitomirskiyi's avatar zhitomirskiyi
Parcourir les fichiers

fixed errror on services inviter action, specs

parent a705824b
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -36,7 +36,7 @@ class Invitation < ActiveRecord::Base ...@@ -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
......
...@@ -83,7 +83,7 @@ describe ServicesController do ...@@ -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 ...@@ -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
......
...@@ -92,7 +92,7 @@ describe Invitation do ...@@ -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 ...@@ -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
......
...@@ -32,7 +32,7 @@ describe Services::Facebook do ...@@ -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
{ {
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter