Merge pull request #8975 from demarches-simplifiees/fix_flaky_bretigny_spec

spec: fix flaky test

app/assets/stylesheets/forms.scss

@@ -61,7 +61,7 @@
     }
 
     input[type='date'] {
-      display: inline;
+      display: inline-block;
     }
   }
 

app/components/procedure/revision_changes_component.rb

@@ -3,6 +3,7 @@ class Procedure::RevisionChangesComponent < ApplicationComponent
     @changes = changes
     @previous_revision = previous_revision
     @public_move_changes, @private_move_changes = changes.filter { _1.op == :move }.partition { !_1.private? }
+    @delete_champ_warning = !total_dossiers.zero? && !@changes.all?(&:can_rebase?)
   end
 
   private

app/components/procedure/revision_changes_component/revision_changes_component.fr.yml

@@ -4,6 +4,9 @@ fr:
   breaking_change:
     one: Un dossier en cours de traitement n’est pas compatible avec ce changement.
     other: "%{count} dossiers en cours de traitement ne sont pas compatible avec ce changement."
+  delete_champ_html:
+    one: "Un dossier en cours de traitement porte ce champ. Les données associées à ce champ seront supprimées."
+    other: "%{count} dossiers en cours de traitement portent ce champ. Les <strong>données</strong> associées avec ce champ seront <strong>supprimées</strong>."
   add_option: "ajoutés : %{items}"
   remove_option: "supprimés : %{items}"
   public:

app/components/procedure/revision_changes_component/revision_changes_component.html.haml

@@ -12,11 +12,14 @@
         - else
           = t(".#{prefix}.add", label: change.label)
         - if !total_dossiers.zero? && !change.can_rebase?
-          %strong
+          .fr-alert.fr-alert--warning.fr-mt-1v
-            = t('.breaking_change', count: total_dossiers)
+            %p= t('.breaking_change', count: total_dossiers)
     - when :remove
       - list.with_item do
         = t(".#{prefix}.remove", label: change.label)
+        - if @delete_champ_warning
+          .fr-alert.fr-alert--warning.fr-mt-1v
+            %p= t('.delete_champ_html', count: total_dossiers)
     - when :update
       - case change.attribute
       - when :libelle
@@ -26,8 +29,8 @@
         - list.with_item do
           = t(".#{prefix}.update_type_champ", label: change.label, to: t("activerecord.attributes.type_de_champ.type_champs.#{change.to}"))
           - if !total_dossiers.zero? && !change.can_rebase?
-            %strong
+            .fr-alert.fr-alert--warning.fr-mt-1v
-              = t('.breaking_change', count: total_dossiers)
+              %p= t('.breaking_change', count: total_dossiers)
       - when :description
         - list.with_item do
           - if change.to.blank?
@@ -45,14 +48,14 @@
           - list.with_item do
             = t(".public.enable_mandatory", label: change.label)
             - if !total_dossiers.zero? && !change.can_rebase?
-              %strong
+              .fr-alert.fr-alert--warning.fr-mt-1v
-                = t('.breaking_change', count: total_dossiers)
+                %p= t('.breaking_change', count: total_dossiers)
         - else
           - list.with_item do
             = t(".public.disable_mandatory", label: change.label)
             - if !total_dossiers.zero? && !change.can_rebase?
-              %strong
+              .fr-alert.fr-alert--warning.fr-mt-1v
-                = t('.breaking_change', count: total_dossiers)
+                %p= t('.breaking_change', count: total_dossiers)
       - when :piece_justificative_template
         - list.with_item do
           = t(".#{prefix}.update_piece_justificative_template", label: change.label)
@@ -69,21 +72,21 @@
               - list.with_item do
                 = t('.remove_option', items: removed.map{ |term| "« #{term.strip} »" }.join(", "))
           - if !total_dossiers.zero? && !change.can_rebase?
-            %strong
+            .fr-alert.fr-alert--warning.fr-mt-1v
-              = t('.breaking_change', count: total_dossiers)
+              %p= t('.breaking_change', count: total_dossiers)
       - when :drop_down_other
         - if change.from == false
           - list.with_item do
             = t(".#{prefix}.enable_drop_down_other", label: change.label)
             - if !total_dossiers.zero? && !change.can_rebase?
-              %strong
+              .fr-alert.fr-alert--warning.fr-mt-1v
-                = t('.breaking_change', count: total_dossiers)
+                %p= t('.breaking_change', count: total_dossiers)
         - else
           - list.with_item do
             = t(".#{prefix}.disable_drop_down_other", label: change.label)
             - if !total_dossiers.zero? && !change.can_rebase?
-              %strong
+              .fr-alert.fr-alert--warning.fr-mt-1v
-                = t('.breaking_change', count: total_dossiers)
+                %p= t('.breaking_change', count: total_dossiers)
       - when :carte_layers
         - added = change.to.sort - change.from.sort
         - removed = change.from.sort - change.to.sort
@@ -114,20 +117,20 @@
           - list.with_item do
             = t(".#{prefix}.add_condition", label: change.label, to: change.to)
             - if !total_dossiers.zero? && !change.can_rebase?
-              %strong
+              .fr-alert.fr-alert--warning.fr-mt-1v
-                = t('.breaking_change', count: total_dossiers)
+                %p= t('.breaking_change', count: total_dossiers)
         - elsif change.to.nil?
           - list.with_item do
             = t(".#{prefix}.remove_condition", label: change.label)
             - if !total_dossiers.zero? && !change.can_rebase?
-              %strong
+              .fr-alert.fr-alert--warning.fr-mt-1v
-                = t('.breaking_change', count: total_dossiers)
+                %p= t('.breaking_change', count: total_dossiers)
         - else
           - list.with_item do
             = t(".#{prefix}.update_condition", label: change.label, to: change.to)
             - if !total_dossiers.zero? && !change.can_rebase?
-              %strong
+              .fr-alert.fr-alert--warning.fr-mt-1v
-                = t('.breaking_change', count: total_dossiers)
+                %p= t('.breaking_change', count: total_dossiers)
 
   - if @public_move_changes.present?
     - list.with_item do

app/models/champs/email_champ.rb

@@ -21,4 +21,11 @@
 #  type_de_champ_id               :integer
 #
 class Champs::EmailChamp < Champs::TextChamp
+  validates :value,
+    format: {
+      with: Devise.email_regexp,
+      message: I18n.t('invalid', scope: 'activerecord.errors.models.email_champ.attributes.value')
+    },
+    allow_nil: true,
+    if: -> { validation_context != :brouillon }
 end

config/locales/en.yml

@@ -561,6 +561,10 @@ en:
           attributes:
             email:
               taken: ': Invitation already sent'
+        email_champ:
+          attributes:
+            value:
+              invalid: "is invalid. Fill in a valid email address, example: john.doe@example.fr"
 
         user:
           attributes: &error_attributes

config/locales/fr.yml

@@ -562,6 +562,10 @@ fr:
           attributes:
             email:
               taken: ': Invitation déjà envoyée'
+        email_champ:
+          attributes:
+            value:
+              invalid: "est invalide. Saisir une adresse éléctronique valide, exemple : john.doe@exemple.fr"
         user:
           attributes: &error_attributes
             reset_password_token:

spec/models/champs/email_champ_spec.rb

@@ -0,0 +1,29 @@
+describe Champs::EmailChamp do
+  subject { build(:champ_email, value: value).tap(&:valid?) }
+
+  describe '#valid?' do
+    context 'when the value is an email' do
+      let(:value) { 'jean@dupont.fr' }
+
+      it { is_expected.to be_valid }
+    end
+
+    context 'when the value is not an email' do
+      let(:value) { 'jean@' }
+
+      it { is_expected.to_not be_valid }
+    end
+
+    context 'when the value is blank' do
+      let(:value) { '' }
+
+      it { is_expected.to_not be_valid }
+    end
+
+    context 'when the value is nil' do
+      let(:value) { nil }
+
+      it { is_expected.to be_valid }
+    end
+  end
+end