diff --git a/app/assets/images/footer/logo-dinsic.svg b/app/assets/images/footer/logo-dinsic.svg
deleted file mode 100644
index 85fa7e780..000000000
--- a/app/assets/images/footer/logo-dinsic.svg
+++ /dev/null
@@ -1 +0,0 @@
-BM_DINSIC BM_DINUM
- demarches-simplifiees.fr est un service fourni par la DINSIC et incubé par beta.gouv.fr
+ demarches-simplifiees.fr est un service fourni par la DINUM et incubé par beta.gouv.fr
diff --git a/app/views/root/_footer.html.haml b/app/views/root/_footer.html.haml
index da808b1d1..a53e41c66 100644
--- a/app/views/root/_footer.html.haml
+++ b/app/views/root/_footer.html.haml
@@ -12,7 +12,7 @@
= link_to "beta.gouv.fr", "https://beta.gouv.fr", title: "le site de Beta.gouv.fr"
%li
= link_to "http://www.modernisation.gouv.fr/", title: "DINUM" do
- %span.footer-logo.footer-logo-dinsic{ role: 'img', 'aria-label': 'DINSIC' }
+ %span.footer-logo.footer-logo-dinum{ role: 'img', 'aria-label': 'DINUM' }
= link_to "https://beta.gouv.fr", title: "le site de Beta.gouv.fr" do
%span.footer-logo.footer-logo-beta-gouv-fr{ role: 'img', 'aria-label': 'beta.gouv.fr' }
diff --git a/app/views/shared/dossiers/_champ_row.html.haml b/app/views/shared/dossiers/_champ_row.html.haml
index cfb9f6be9..25644bb62 100644
--- a/app/views/shared/dossiers/_champ_row.html.haml
+++ b/app/views/shared/dossiers/_champ_row.html.haml
@@ -34,6 +34,8 @@
= c.to_s
- when TypeDeChamp.type_champs.fetch(:datetime)
= c.to_s
+ - when TypeDeChamp.type_champs.fetch(:number)
+ = number_with_delimiter(c.to_s)
- else
= format_text_value(c.to_s)
diff --git a/app/views/users/sessions/new.html.haml b/app/views/users/sessions/new.html.haml
index de0d29092..ecb783bfe 100644
--- a/app/views/users/sessions/new.html.haml
+++ b/app/views/users/sessions/new.html.haml
@@ -9,7 +9,7 @@
= f.text_field :email, autofocus: true
= f.label :password, "Mot de passe"
- = f.password_field :password, placeholder: "8 caractères minimum"
+ = f.password_field :password
.auth-options
%div
diff --git a/config/env.example b/config/env.example
index 608fd59ff..7b3515bd5 100644
--- a/config/env.example
+++ b/config/env.example
@@ -36,7 +36,6 @@ FOG_OPENSTACK_USERNAME=""
FOG_OPENSTACK_URL=""
FOG_OPENSTACK_IDENTITY_API_VERSION=""
FOG_OPENSTACK_REGION=""
-FOG_DIRECTORY=""
FOG_ENABLED="" # valeur attendue: enabled
DS_PROXY_URL=""
diff --git a/config/secrets.yml b/config/secrets.yml
index 3d7ffa9af..4b670eb6e 100644
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -33,15 +33,6 @@ defaults: &defaults
key: <%= ENV['API_ENTREPRISE_KEY'] %>
pipedrive:
key: <%= ENV['PIPEDRIVE_KEY'] %>
- fog:
- enabled: <%= ENV['FOG_ENABLED'] == 'enabled' %>
- openstack_tenant: <%= ENV['FOG_OPENSTACK_TENANT'] %>
- openstack_api_key: <%= ENV['FOG_OPENSTACK_API_KEY'] %>
- openstack_username: <%= ENV['FOG_OPENSTACK_USERNAME'] %>
- openstack_auth_url: <%= ENV['FOG_OPENSTACK_URL'] %>
- openstack_identity_api_version: "<%= ENV['FOG_OPENSTACK_IDENTITY_API_VERSION'] %>"
- openstack_region: <%= ENV['FOG_OPENSTACK_REGION'] %>
- directory: <%= ENV['FOG_DIRECTORY'] %>
mailtrap:
username: <%= ENV['MAILTRAP_USERNAME'] %>
password: <%= ENV['MAILTRAP_PASSWORD'] %>
@@ -87,8 +78,6 @@ test:
signing_key: aef3153a9829fa4ba10acb02927ac855df6b92795b1ad265d654443c4b14a017
api_entreprise:
key: api_entreprise_test_key
- fog:
- directory: tps_dev
pipedrive:
key: pipedrive_test_key
france_connect_particulier:
diff --git a/spec/controllers/manager/demandes_controller_spec.rb b/spec/controllers/manager/demandes_controller_spec.rb
new file mode 100644
index 000000000..39ceb7806
--- /dev/null
+++ b/spec/controllers/manager/demandes_controller_spec.rb
@@ -0,0 +1,20 @@
+describe Manager::DemandesController, type: :controller do
+ let(:administration) { create(:administration) }
+
+ describe 'GET #index' do
+ before do
+ sign_in administration
+ end
+
+ it "display pending demandes" do
+ approved_administrateur = create(:administrateur, email: "approved@example.com")
+ pending_demande = { email: 'pending@example.com' }
+ demandes = [{ email: approved_administrateur.email }, pending_demande]
+ allow(PipedriveService).to receive(:get_demandes).and_return(demandes)
+
+ get :index
+
+ expect(assigns(:pending_demandes)).to eq([pending_demande])
+ end
+ end
+end
diff --git a/spec/factories/procedure.rb b/spec/factories/procedure.rb
index 5dbfdaebc..c15af065d 100644
--- a/spec/factories/procedure.rb
+++ b/spec/factories/procedure.rb
@@ -3,8 +3,8 @@ FactoryBot.define do
factory :procedure do
sequence(:libelle) { |n| "Procedure #{n}" }
description { "Demande de subvention à l'intention des associations" }
- organisation { "Orga DINSIC" }
- direction { "direction DINSIC" }
+ organisation { "Orga DINUM" }
+ direction { "direction DINUM" }
cadre_juridique { "un cadre juridique important" }
published_at { nil }
duree_conservation_dossiers_dans_ds { 3 }