Revert "don't seed beta users with default aspects"
This reverts commit 946f78b025.
This commit is contained in:
parent
f3174941bd
commit
3e09d4ed14
2 changed files with 6 additions and 17 deletions
|
|
@ -13,16 +13,15 @@ class RegistrationsController < Devise::RegistrationsController
|
||||||
|
|
||||||
if @user.save
|
if @user.save
|
||||||
flash[:notice] = I18n.t 'registrations.create.success'
|
flash[:notice] = I18n.t 'registrations.create.success'
|
||||||
if invite.present? && invite.beta?
|
@user.seed_aspects
|
||||||
Role.add_beta(@user.person)
|
Role.add_beta(@user.person) if invite.present? && invite.beta?
|
||||||
else
|
|
||||||
@user.seed_aspects
|
|
||||||
end
|
|
||||||
sign_in_and_redirect(:user, @user)
|
sign_in_and_redirect(:user, @user)
|
||||||
|
Rails.logger.info("event=registration status=successful user=#{@user.diaspora_handle}")
|
||||||
else
|
else
|
||||||
@user.errors.delete(:person)
|
@user.errors.delete(:person)
|
||||||
|
|
||||||
flash[:error] = @user.errors.full_messages.join(";")
|
flash[:error] = @user.errors.full_messages.join(";")
|
||||||
|
Rails.logger.info("event=registration status=failure errors='#{@user.errors.full_messages.join(', ')}'")
|
||||||
render :new
|
render :new
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,8 @@ describe RegistrationsController do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
describe "#create" do
|
describe "#create" do
|
||||||
context "with valid parameters" do
|
context "with valid parameters" do
|
||||||
before do
|
before do
|
||||||
|
|
@ -90,18 +92,6 @@ describe RegistrationsController do
|
||||||
get :create, @valid_params.merge(:invite => {:token => bob.invitation_code.token})
|
get :create, @valid_params.merge(:invite => {:token => bob.invitation_code.token})
|
||||||
User.last.should be_beta
|
User.last.should be_beta
|
||||||
end
|
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
|
end
|
||||||
|
|
||||||
context "with invalid parameters" do
|
context "with invalid parameters" do
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue