DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Add notice when merging account

Browse source
This commit is contained in:
simon lehericey 2021-10-04 15:44:05 +02:00
parent a480b31eb5
commit 5009c583ea
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/manager/users_controller.rb
View file

@ -28,6 +28,8 @@ module Manager
else else
preexisting_user.expert.merge(user.expert) preexisting_user.expert.merge(user.expert)
end end
flash[:notice] = "Le compte « #{targeted_email} » a absorbé le compte « #{user.email} »."
end end
redirect_to edit_manager_user_path(user) redirect_to edit_manager_user_path(user)

1
spec/controllers/manager/users_controller_spec.rb
View file

@ -68,6 +68,7 @@ describe Manager::UsersController, type: :controller do
expect(preexisting_user.instructeur).to match(instructeur) expect(preexisting_user.instructeur).to match(instructeur)
expect(preexisting_user.expert).to match(expert) expect(preexisting_user.expert).to match(expert)
expect(flash[:notice]).to match("Le compte « email.existant@domaine.fr » a absorbé le compte « ancien.email@domaine.fr ».")
end end
context 'and the preexisting account owns an instructeur and expert as well' do context 'and the preexisting account owns an instructeur and expert as well' do