diff --git a/app/controllers/gestionnaires/groupe_gestionnaire_administrateurs_controller.rb b/app/controllers/gestionnaires/groupe_gestionnaire_administrateurs_controller.rb index d32d8783c..da05c8a4b 100644 --- a/app/controllers/gestionnaires/groupe_gestionnaire_administrateurs_controller.rb +++ b/app/controllers/gestionnaires/groupe_gestionnaire_administrateurs_controller.rb @@ -16,7 +16,7 @@ module Gestionnaires if not_found_emails.present? administrateurs_to_add += not_found_emails.map do |email| user = User.create_or_promote_to_administrateur(email, SecureRandom.hex) - user.invite_administrateur!(@groupe_gestionnaire) + user.invite_administrateur! user.administrateur end end diff --git a/app/controllers/manager/administrateurs_controller.rb b/app/controllers/manager/administrateurs_controller.rb index befabd759..33cd99d46 100644 --- a/app/controllers/manager/administrateurs_controller.rb +++ b/app/controllers/manager/administrateurs_controller.rb @@ -14,7 +14,7 @@ module Manager end def reinvite - Administrateur.find_inactive_by_id(params[:id]).user.invite_administrateur!(current_super_admin.id) + Administrateur.find_inactive_by_id(params[:id]).user.invite_administrateur! flash.notice = "Invitation renvoyée" redirect_to manager_administrateur_path(params[:id]) end diff --git a/app/mailers/administration_mailer.rb b/app/mailers/administration_mailer.rb index cf800c2e4..baa26e321 100644 --- a/app/mailers/administration_mailer.rb +++ b/app/mailers/administration_mailer.rb @@ -2,10 +2,10 @@ class AdministrationMailer < ApplicationMailer layout 'mailers/layout' - def invite_admin(user, reset_password_token, administration_id) + def invite_admin(user, reset_password_token) @reset_password_token = reset_password_token @user = user - @author_name = BizDev.full_name(administration_id) + @author_name = "Équipe de #{APPLICATION_NAME}" subject = "Activez votre compte administrateur" mail(to: user.email, diff --git a/app/models/super_admin.rb b/app/models/super_admin.rb index dc0a132ac..d6fa4a51f 100644 --- a/app/models/super_admin.rb +++ b/app/models/super_admin.rb @@ -32,7 +32,7 @@ class SuperAdmin < ApplicationRecord user = User.create_or_promote_to_administrateur(email, SecureRandom.hex) if user.valid? - user.invite_administrateur!(id) + user.invite_administrateur! Procedure.create_initiation_procedure(user.administrateur) end diff --git a/app/models/user.rb b/app/models/user.rb index ad6be60bb..a2bd2d45d 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -85,8 +85,8 @@ class User < ApplicationRecord UserMailer.invite_gestionnaire(self, set_reset_password_token, groupe_gestionnaire).deliver_later end - def invite_administrateur!(administration_id) - AdministrationMailer.invite_admin(self, set_reset_password_token, administration_id).deliver_later + def invite_administrateur! + AdministrationMailer.invite_admin(self, set_reset_password_token).deliver_later end def remind_invitation! diff --git a/spec/mailers/administration_mailer_spec.rb b/spec/mailers/administration_mailer_spec.rb index de85f35e1..42a416acf 100644 --- a/spec/mailers/administration_mailer_spec.rb +++ b/spec/mailers/administration_mailer_spec.rb @@ -2,10 +2,9 @@ RSpec.describe AdministrationMailer, type: :mailer do describe '#invite_admin' do let(:admin_user) { create(:user, last_sign_in_at: last_sign_in_at) } let(:token) { "some_token" } - let(:administration_id) { BizDev::PIPEDRIVE_ID } let(:last_sign_in_at) { nil } - subject { described_class.invite_admin(admin_user, token, administration_id) } + subject { described_class.invite_admin(admin_user, token) } it { expect(subject.subject).not_to be_empty } diff --git a/spec/mailers/previews/administration_mailer_preview.rb b/spec/mailers/previews/administration_mailer_preview.rb index e788773c6..989034fc3 100644 --- a/spec/mailers/previews/administration_mailer_preview.rb +++ b/spec/mailers/previews/administration_mailer_preview.rb @@ -1,10 +1,10 @@ class AdministrationMailerPreview < ActionMailer::Preview def invite_admin - AdministrationMailer.invite_admin(administrateur, "12345678", 0) + AdministrationMailer.invite_admin(administrateur, "12345678") end def invite_admin_whose_already_has_an_account - AdministrationMailer.invite_admin(administrateur, nil, 0) + AdministrationMailer.invite_admin(administrateur, nil) end def refuse_admin diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 4e875ac9f..39b08e5eb 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -223,12 +223,12 @@ describe User, type: :model do before { allow(AdministrationMailer).to receive(:invite_admin).and_return(mailer_double) } - subject { user.invite_administrateur!(super_admin.id) } + subject { user.invite_administrateur! } context 'when the user is inactif' do before { subject } - it { expect(AdministrationMailer).to have_received(:invite_admin).with(user, kind_of(String), super_admin.id) } + it { expect(AdministrationMailer).to have_received(:invite_admin).with(user, kind_of(String)) } end context 'when the user is actif' do @@ -238,7 +238,7 @@ describe User, type: :model do end it 'receives an invitation to update its password' do - expect(AdministrationMailer).to have_received(:invite_admin).with(user, kind_of(String), super_admin.id) + expect(AdministrationMailer).to have_received(:invite_admin).with(user, kind_of(String)) end end end