diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 09d11abc2068e15ad57fbde12d85e722cd18c025..14a7b51de0475291b7205f2e1c56415ec4783ac3 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -13,16 +13,15 @@ class RegistrationsController < Devise::RegistrationsController if @user.save flash[:notice] = I18n.t 'registrations.create.success' - if invite.present? && invite.beta? - Role.add_beta(@user.person) - else - @user.seed_aspects - end + @user.seed_aspects + Role.add_beta(@user.person) if invite.present? && invite.beta? sign_in_and_redirect(:user, @user) + Rails.logger.info("event=registration status=successful user=#{@user.diaspora_handle}") else @user.errors.delete(:person) flash[:error] = @user.errors.full_messages.join(";") + Rails.logger.info("event=registration status=failure errors='#{@user.errors.full_messages.join(', ')}'") render :new end end diff --git a/spec/controllers/registrations_controller_spec.rb b/spec/controllers/registrations_controller_spec.rb index ecb44a4ace77d880022772c5d71b62d4c2e0e75e..4b02cd0f9414e087b3a0b4d37b0f958b645451d5 100644 --- a/spec/controllers/registrations_controller_spec.rb +++ b/spec/controllers/registrations_controller_spec.rb @@ -52,6 +52,8 @@ describe RegistrationsController do end end + + describe "#create" do context "with valid parameters" do before do @@ -90,18 +92,6 @@ describe RegistrationsController do get :create, @valid_params.merge(:invite => {:token => bob.invitation_code.token}) User.last.should be_beta end - - it 'with an invite code from a beta users, does not seed aspects' do - Role.add_beta(bob.person) - - user = Factory(:user) - user.aspects.delete_all - - User.any_instance.stub(:create).and_return(user) - - get :create, @valid_params.merge(:invite => {:token => bob.invitation_code.token}) - user.aspects.should be_empty - end end context "with invalid parameters" do