Skip to content
Extraits de code Groupes Projets
Valider 3e09d4ed rédigé par danielgrippi's avatar danielgrippi
Parcourir les fichiers

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

This reverts commit 946f78b0.
parent f3174941
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -13,16 +13,15 @@ class RegistrationsController < Devise::RegistrationsController ...@@ -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 ...@@ -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 ...@@ -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
......
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