From 9d091bbf6a2d5f4ac6030b3f501fb1e04cc3d1b2 Mon Sep 17 00:00:00 2001 From: zhitomirskiyi Date: Fri, 28 Jan 2011 17:22:03 -0800 Subject: [PATCH] facebook invitations actually work --- app/models/user.rb | 2 +- spec/controllers/invitations_controller_spec.rb | 1 + spec/models/user/invite_spec.rb | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index 5147904bd..0f850180b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -237,13 +237,13 @@ class User < ActiveRecord::Base ###Helpers############ def self.build(opts = {}) u = User.new(opts) - u.email = opts[:email] u.setup(opts) u end def setup(opts) self.username = opts[:username] + self.email = opts[:email] self.valid? errors = self.errors errors.delete :person diff --git a/spec/controllers/invitations_controller_spec.rb b/spec/controllers/invitations_controller_spec.rb index b27d63294..118025b1b 100644 --- a/spec/controllers/invitations_controller_spec.rb +++ b/spec/controllers/invitations_controller_spec.rb @@ -71,6 +71,7 @@ describe InvitationsController do @invited_user = @user.invite_user(@aspect.id, 'email', "a@a.com") @accept_params = {:user=> {:password_confirmation =>"password", + :email => "a@a.com", :username=>"josh", :password=>"password", :invitation_token => @invited_user.invitation_token}} diff --git a/spec/models/user/invite_spec.rb b/spec/models/user/invite_spec.rb index ff1323f34..41343b472 100644 --- a/spec/models/user/invite_spec.rb +++ b/spec/models/user/invite_spec.rb @@ -72,6 +72,7 @@ describe User do describe "#accept_invitation!" do let(:invited_user) {@invited_user_pre.accept_invitation!(:invitation_token => "abc", + :email => "a@a.com", :username => "user", :password => "secret", :password_confirmation => "secret",