Revert "don't seed beta users with default aspects"

This reverts commit 946f78b025.
This commit is contained in:
danielgrippi 2012-05-24 11:42:37 -07:00
parent f3174941bd
commit 3e09d4ed14
2 changed files with 6 additions and 17 deletions

View file

@ -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
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

View file

@ -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