- <%= button_to "supprimer", delete_manager_user_path(page.resource), method: :delete, disabled: !page.resource.can_be_deleted?, class: "button", data: { confirm: "Confirmez-vous la suppression de l'utilisateur ?" }, title: page.resource.can_be_deleted? ? "Supprimer" : "Cet utilisateur a des dossiers dont l'instruction a commencé et ne peut être supprimé" %>
+ <%= button_to "supprimer", delete_manager_user_path(page.resource), method: :delete, disabled: !page.resource.can_be_deleted?, class: "button", data: { confirm: "Confirmez-vous la suppression de l'utilisateur ?" }, title: page.resource.can_be_deleted? ? "Supprimer" : "Cet utilisateur ne peut être supprimé. Il a des dossiers dont l'instruction a commencé ou il est administrateur ou instructeur" %>
<% if !user.confirmed? %>
diff --git a/app/views/new_administrateur/procedure_administrateurs/_add_admin_form.html.haml b/app/views/new_administrateur/procedure_administrateurs/_add_admin_form.html.haml
index 67c79d745..14692df28 100644
--- a/app/views/new_administrateur/procedure_administrateurs/_add_admin_form.html.haml
+++ b/app/views/new_administrateur/procedure_administrateurs/_add_admin_form.html.haml
@@ -1,4 +1,4 @@
-= form_for procedure.administrateurs.new,
+= form_for procedure.administrateurs.new(user: User.new),
url: { controller: 'procedure_administrateurs' },
html: { class: 'form', id: "procedure-#{procedure.id}-new_administrateur" } ,
remote: true do |f|
diff --git a/app/views/new_administrateur/procedure_administrateurs/index.html.haml b/app/views/new_administrateur/procedure_administrateurs/index.html.haml
index d270dad37..8383f5e78 100644
--- a/app/views/new_administrateur/procedure_administrateurs/index.html.haml
+++ b/app/views/new_administrateur/procedure_administrateurs/index.html.haml
@@ -11,7 +11,7 @@
%th= 'Enregistré le'
%th= 'État'
%tbody{ id: "procedure-#{@procedure.id}-administrateurs" }
- = render partial: 'administrateur', collection: @procedure.administrateurs.order(:email)
+ = render partial: 'administrateur', collection: @procedure.administrateurs.order('users.email')
%tfoot
%tr
%th{ colspan: 4 }
diff --git a/config/routes.rb b/config/routes.rb
index 7feeaadb4..30d4a3402 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -32,6 +32,7 @@ Rails.application.routes.draw do
resources :instructeurs, only: [:index, :show] do
post 'reinvite', on: :member
+ delete 'delete', on: :member
end
resources :dossiers, only: [:show]
diff --git a/db/migrate/20200130165328_remove_unique_constraint_on_administrateur_emails.rb b/db/migrate/20200130165328_remove_unique_constraint_on_administrateur_emails.rb
new file mode 100644
index 000000000..daa071220
--- /dev/null
+++ b/db/migrate/20200130165328_remove_unique_constraint_on_administrateur_emails.rb
@@ -0,0 +1,13 @@
+class RemoveUniqueConstraintOnAdministrateurEmails < ActiveRecord::Migration[5.2]
+ def up
+ # Drop the index entirely
+ remove_index :administrateurs, :email
+ # Add the index again, without the unicity constraint
+ add_index :administrateurs, :email
+ end
+
+ def down
+ remove_index :administrateurs, :email
+ add_index :administrateurs, :email, unique: true
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index e998f6be4..8bf635fc8 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2020_01_14_113700) do
+ActiveRecord::Schema.define(version: 2020_01_30_165328) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -53,7 +53,7 @@ ActiveRecord::Schema.define(version: 2020_01_14_113700) do
t.datetime "updated_at"
t.boolean "active", default: false
t.string "encrypted_token"
- t.index ["email"], name: "index_administrateurs_on_email", unique: true
+ t.index ["email"], name: "index_administrateurs_on_email"
end
create_table "administrateurs_instructeurs", id: false, force: :cascade do |t|
diff --git a/spec/controllers/manager/instructeurs_controller_spec.rb b/spec/controllers/manager/instructeurs_controller_spec.rb
new file mode 100644
index 000000000..3a0164d4b
--- /dev/null
+++ b/spec/controllers/manager/instructeurs_controller_spec.rb
@@ -0,0 +1,17 @@
+describe Manager::InstructeursController, type: :controller do
+ let(:administration) { create(:administration) }
+
+ describe '#delete' do
+ let!(:instructeur) { create(:instructeur) }
+
+ before { sign_in administration }
+
+ subject { delete :delete, params: { id: instructeur.id } }
+
+ it 'deletes the instructeur' do
+ subject
+
+ expect(Instructeur.find_by(id: instructeur.id)).to be_nil
+ end
+ end
+end
diff --git a/spec/factories/administrateur.rb b/spec/factories/administrateur.rb
index 277cfd415..c82404e2c 100644
--- a/spec/factories/administrateur.rb
+++ b/spec/factories/administrateur.rb
@@ -1,9 +1,8 @@
FactoryBot.define do
sequence(:administrateur_email) { |n| "admin#{n}@admin.com" }
factory :administrateur do
- email { generate(:administrateur_email) }
-
transient do
+ email { generate(:administrateur_email) }
password { 'mon chien aime les bananes' }
end
diff --git a/spec/features/admin/admin_creation_spec.rb b/spec/features/admin/admin_creation_spec.rb
index de719edc9..a5ce312dc 100644
--- a/spec/features/admin/admin_creation_spec.rb
+++ b/spec/features/admin/admin_creation_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
feature 'As an administrateur', js: true do
let(:administration) { create(:administration) }
let(:admin_email) { 'new_admin@gouv.fr' }
- let(:new_admin) { Administrateur.find_by(email: admin_email) }
+ let(:new_admin) { Administrateur.by_email(admin_email) }
before do
perform_enqueued_jobs do
diff --git a/spec/features/admin/procedure_update_spec.rb b/spec/features/admin/procedure_update_spec.rb
index f2d09565a..7fc165ab3 100644
--- a/spec/features/admin/procedure_update_spec.rb
+++ b/spec/features/admin/procedure_update_spec.rb
@@ -59,4 +59,18 @@ feature 'Administrateurs can edit procedures', js: true do
expect(page).to have_field('procedure_libelle', with: 'Ma petite démarche')
end
end
+
+ scenario 'the administrator can add another administrator' do
+ another_administrateur = create(:administrateur)
+ visit admin_procedure_path(procedure)
+ click_on 'Administrateurs'
+
+ fill_in('administrateur_email', with: another_administrateur.email)
+
+ click_on 'Ajouter comme administrateur'
+
+ within('.alert-success') do
+ expect(page).to have_content(another_administrateur.email)
+ end
+ end
end
diff --git a/spec/mailers/application_mailer_spec.rb b/spec/mailers/application_mailer_spec.rb
index 9cfa295f9..f4464b7ba 100644
--- a/spec/mailers/application_mailer_spec.rb
+++ b/spec/mailers/application_mailer_spec.rb
@@ -3,16 +3,6 @@ RSpec.describe ApplicationMailer, type: :mailer do
let(:dossier) { create(:dossier, procedure: build(:simple_procedure)) }
subject { DossierMailer.notify_new_draft(dossier) }
- describe 'invalid emails are not sent' do
- before do
- allow_any_instance_of(DossierMailer)
- .to receive(:notify_new_draft)
- .and_raise(Net::SMTPSyntaxError)
- end
-
- it { expect(subject.message).to be_an_instance_of(ActionMailer::Base::NullMail) }
- end
-
describe 'valid emails are sent' do
it { expect(subject.message).not_to be_an_instance_of(ActionMailer::Base::NullMail) }
end
diff --git a/spec/mailers/previews/administration_mailer_preview.rb b/spec/mailers/previews/administration_mailer_preview.rb
index 7527f9632..189650445 100644
--- a/spec/mailers/previews/administration_mailer_preview.rb
+++ b/spec/mailers/previews/administration_mailer_preview.rb
@@ -41,6 +41,6 @@ class AdministrationMailerPreview < ActionMailer::Preview
end
def administrateur
- Administrateur.new(id: 111, email: "chef.de.service@administration.gouv.fr")
+ Administrateur.new(id: 111, user: User.new(email: "chef.de.service@administration.gouv.fr"))
end
end
diff --git a/spec/models/administrateur_spec.rb b/spec/models/administrateur_spec.rb
index 9f0c30923..3b1a023cd 100644
--- a/spec/models/administrateur_spec.rb
+++ b/spec/models/administrateur_spec.rb
@@ -24,13 +24,6 @@ describe Administrateur, type: :model do
describe "#can_be_deleted?" do
subject { administrateur.can_be_deleted? }
- context 'when the administrateur has a dossier in instruction' do
- let!(:dossier) { create(:dossier, :en_instruction) }
- let(:administrateur) { dossier.procedure.administrateurs.first }
-
- it { is_expected.to be false }
- end
-
context "when the administrateur's procedures have other administrateurs" do
let!(:administrateur) { create(:administrateur) }
let!(:autre_administrateur) { create(:administrateur) }
@@ -39,6 +32,13 @@ describe Administrateur, type: :model do
it { is_expected.to be true }
end
+ context "when the administrateur has a procedure where they is the only admin" do
+ let!(:administrateur) { create(:administrateur) }
+ let!(:procedure) { create(:procedure, administrateurs: [administrateur]) }
+
+ it { is_expected.to be false }
+ end
+
context "when the administrateur has no procedure" do
let!(:administrateur) { create(:administrateur) }
@@ -46,6 +46,21 @@ describe Administrateur, type: :model do
end
end
+ describe '#delete_and_transfer_services' do
+ let!(:administrateur) { create(:administrateur) }
+ let!(:autre_administrateur) { create(:administrateur) }
+ let!(:procedure) { create(:procedure, :with_service, administrateurs: [administrateur, autre_administrateur]) }
+ let(:service) { procedure.service }
+
+ it "delete and transfer services to other admin" do
+ service.update(administrateur: administrateur)
+ administrateur.delete_and_transfer_services
+
+ expect(Administrateur.find_by(id: administrateur.id)).to be_nil
+ expect(service.reload.administrateur).to eq(autre_administrateur)
+ end
+ end
+
# describe '#password_complexity' do
# let(:email) { 'mail@beta.gouv.fr' }
# let(:passwords) { ['pass', '12pass23', 'démarches ', 'démarches-simple', 'démarches-simplifiées-pwd'] }
diff --git a/spec/models/concern/tags_substitution_concern_spec.rb b/spec/models/concern/tags_substitution_concern_spec.rb
index f80832d3f..288c0075a 100644
--- a/spec/models/concern/tags_substitution_concern_spec.rb
+++ b/spec/models/concern/tags_substitution_concern_spec.rb
@@ -114,6 +114,29 @@ describe TagsSubstitutionConcern, type: :model do
end
end
+ context 'when the procedure has a type de champ with apostrophes' do
+ let(:types_de_champ) do
+ [
+ create(:type_de_champ, libelle: "Intitulé de l'‘«\"évènement\"»’")
+ ]
+ end
+
+ context 'and they are used in the template' do
+ let(:template) { "--Intitulé de l'‘«\"évènement\"»’--" }
+
+ context 'and their value in the dossier are not nil' do
+ before do
+ dossier.champs
+ .filter { |champ| champ.libelle == "Intitulé de l'‘«\"évènement\"»’" }
+ .first
+ .update(value: 'ceci est mon évènement')
+ end
+
+ it { is_expected.to eq('ceci est mon évènement') }
+ end
+ end
+ end
+
context 'when the procedure has a type de champ repetition' do
let(:template) { '--Répétition--' }
let(:types_de_champ) do
diff --git a/spec/models/instructeur_spec.rb b/spec/models/instructeur_spec.rb
index 37917bf18..78737bf89 100644
--- a/spec/models/instructeur_spec.rb
+++ b/spec/models/instructeur_spec.rb
@@ -424,9 +424,40 @@ describe Instructeur, type: :model do
it { expect(instructeur_a.procedures.all.to_ary).to eq([procedure_a]) }
end
+ describe "#can_be_deleted?" do
+ subject { instructeur.can_be_deleted? }
+
+ context 'when the instructeur is an administrateur' do
+ let!(:administrateur) { create(:administrateur) }
+ let(:instructeur) { administrateur.instructeur }
+
+ it { is_expected.to be false }
+ end
+
+ context "when the instructeur's procedures have other instructeurs" do
+ let(:instructeur_not_admin) { create(:instructeur) }
+ let(:autre_instructeur) { create(:instructeur) }
+
+ it "can be deleted" do
+ assign(procedure, instructeur_assigne: instructeur_not_admin)
+ assign(procedure, instructeur_assigne: autre_instructeur)
+ expect(autre_instructeur.can_be_deleted?).to be_truthy
+ end
+ end
+
+ context "when the instructeur's procedures is the only one" do
+ let(:instructeur_not_admin) { create :instructeur }
+ let(:autre_procedure) { create :procedure }
+ it "can be deleted" do
+ assign(autre_procedure, instructeur_assigne: instructeur_not_admin)
+ expect(instructeur_not_admin.can_be_deleted?).to be_falsy
+ end
+ end
+ end
+
private
- def assign(procedure_to_assign)
- create :assign_to, instructeur: instructeur, procedure: procedure_to_assign, groupe_instructeur: procedure_to_assign.defaut_groupe_instructeur
+ def assign(procedure_to_assign, instructeur_assigne: instructeur)
+ create :assign_to, instructeur: instructeur_assigne, procedure: procedure_to_assign, groupe_instructeur: procedure_to_assign.defaut_groupe_instructeur
end
end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index b127d35c6..1af6ae573 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -224,6 +224,24 @@ describe User, type: :model do
context 'when the user has no dossier in instruction' do
it { is_expected.to be true }
end
+
+ context 'when the user is an administrateur' do
+ it 'cannot be deleted' do
+ administrateur = create(:administrateur)
+ user = administrateur.user
+
+ expect(user.can_be_deleted?).to be_falsy
+ end
+ end
+
+ context 'when the user is an instructeur' do
+ it 'cannot be deleted' do
+ instructeur = create(:instructeur)
+ user = instructeur.user
+
+ expect(user.can_be_deleted?).to be_falsy
+ end
+ end
end
describe '#delete_and_keep_track_dossiers' do
@@ -241,12 +259,39 @@ describe User, type: :model do
let!(:dossier_en_construction) { create(:dossier, :en_construction, user: user) }
let!(:dossier_brouillon) { create(:dossier, user: user) }
- it "keep track of dossiers and delete user" do
- user.delete_and_keep_track_dossiers(administration)
+ context 'without a hidden dossier' do
+ it "keep track of dossiers and delete user" do
+ user.delete_and_keep_track_dossiers(administration)
- expect(DeletedDossier.find_by(dossier_id: dossier_en_construction)).to be_present
- expect(DeletedDossier.find_by(dossier_id: dossier_brouillon)).to be_present
- expect(User.find_by(id: user.id)).to be_nil
+ expect(DeletedDossier.find_by(dossier_id: dossier_en_construction)).to be_present
+ expect(DeletedDossier.find_by(dossier_id: dossier_brouillon)).to be_present
+ expect(User.find_by(id: user.id)).to be_nil
+ end
+ end
+
+ context 'with a hidden dossier' do
+ let!(:dossier_cache) do
+ create(:dossier, :en_construction, user: user)
+ end
+ let!(:dossier_from_another_user) do
+ create(:dossier, :en_construction, user: create(:user))
+ end
+
+ it "keep track of dossiers and delete user" do
+ dossier_cache.delete_and_keep_track(administration)
+ user.delete_and_keep_track_dossiers(administration)
+
+ expect(DeletedDossier.find_by(dossier_id: dossier_en_construction)).to be_present
+ expect(DeletedDossier.find_by(dossier_id: dossier_brouillon)).to be_present
+ expect(User.find_by(id: user.id)).to be_nil
+ end
+
+ it "doesn't destroy dossiers of another user" do
+ dossier_cache.delete_and_keep_track(administration)
+ user.delete_and_keep_track_dossiers(administration)
+
+ expect(Dossier.find_by(id: dossier_from_another_user.id)).to be_present
+ end
end
end
end