Add verification on user dossier description for champs mandatory

spec/controllers/admin/types_de_champ_controller_spec.rb

@@ -37,6 +37,7 @@ describe Admin::TypesDeChampController, type: :controller do
     let(:description) { 'titi' }
     let(:order_place) { '' }
     let(:types_de_champ_id) { '' }
+    let(:mandatory) { 'on' }
 
     let(:procedure_params) do
       { types_de_champ_attributes:
@@ -46,7 +47,8 @@ describe Admin::TypesDeChampController, type: :controller do
             type_champ: type_champ,
             description: description,
             order_place: order_place,
-            id: types_de_champ_id
+            id: types_de_champ_id,
+            mandatory: mandatory
           }
         }
       }
@@ -67,7 +69,7 @@ describe Admin::TypesDeChampController, type: :controller do
         it { expect(subject.libelle).to eq('mon libelle') }
         it { expect(subject.type_champ).to eq('text') }
         it { expect(subject.description).to eq('titi') }
-        # it { expect(subject.order_place).to eq('0') }
+        it { expect(subject.mandatory).to be_truthy }
       end
 
       context 'when type_de_champ already exist' do
@@ -78,6 +80,7 @@ describe Admin::TypesDeChampController, type: :controller do
         let(:type_champ) { 'text' }
         let(:description) { 'citrouille' }
         let(:order_place) { '0' }
+        let(:mandatory) { 'on' }
         before do
           request
           procedure.reload
@@ -86,7 +89,8 @@ describe Admin::TypesDeChampController, type: :controller do
         it { expect(subject.libelle).to eq('toto') }
         it { expect(subject.type_champ).to eq('text') }
         it { expect(subject.description).to eq('citrouille') }
-        # it { expect(subject.order_place).to eq(0) }
+        it { expect(subject.order_place).to eq(0) }
+        it { expect(subject.order_place).to be_truthy }
       end
     end
     context 'when procedure is not found' do

spec/controllers/users/description_controller_spec.rb

@@ -4,7 +4,7 @@ describe Users::DescriptionController, type: :controller do
   let(:user) { create(:user) }
 
   let(:procedure) { create(:procedure, :with_two_type_de_piece_justificative, :with_type_de_champ, cerfa_flag: true) }
-  let!(:dossier) { create(:dossier, procedure: procedure, user: user) }
+  let(:dossier) { create(:dossier, procedure: procedure, user: user) }
 
   let(:dossier_id) { dossier.id }
   let(:bad_dossier_id) { Dossier.count + 10000 }
@@ -103,9 +103,9 @@ describe Users::DescriptionController, type: :controller do
     context 'Attribut(s) manquant(s)' do
       subject {
         post :create,
-            dossier_id: dossier_id,
-            nom_projet: nom_projet,
-            description: description
+             dossier_id: dossier_id,
+             nom_projet: nom_projet,
+             description: description
       }
       before { subject }
 
@@ -126,9 +126,9 @@ describe Users::DescriptionController, type: :controller do
       context 'Sauvegarde du CERFA PDF' do
         before do
           post :create, dossier_id: dossier_id,
-                        nom_projet: nom_projet,
-                        description: description,
-                        cerfa_pdf: cerfa_pdf
+               nom_projet: nom_projet,
+               description: description,
+               cerfa_pdf: cerfa_pdf
           dossier.reload
         end
 
@@ -164,11 +164,11 @@ describe Users::DescriptionController, type: :controller do
     context 'Quand la procédure n\'accepte pas les CERFA' do
       context 'Sauvegarde du CERFA PDF' do
         let!(:procedure) { create(:procedure) }
-        before do        
+        before do
           post :create, dossier_id: dossier_id,
-                        nom_projet: nom_projet,
-                        description: description,
-                        cerfa_pdf: cerfa_pdf
+               nom_projet: nom_projet,
+               description: description,
+               cerfa_pdf: cerfa_pdf
           dossier.reload
         end
 
@@ -178,7 +178,7 @@ describe Users::DescriptionController, type: :controller do
       end
     end
 
-    context 'Sauvegarde des champs' do
+    describe 'Sauvegarde des champs' do
       let(:champs_dossier) { dossier.champs }
       let(:dossier_champs_first) { 'test value' }
 
@@ -194,22 +194,31 @@ describe Users::DescriptionController, type: :controller do
       end
 
       it { expect(dossier.champs.first.value).to eq(dossier_champs_first) }
+      it { expect(response).to redirect_to users_dossier_recapitulatif_path }
 
       context 'when champs value is empty' do
-        let(:dossier_champs_first) { 'test value' }
+        let(:dossier_champs_first) { '' }
 
         it { expect(dossier.champs.first.value).to eq(dossier_champs_first) }
+        it { expect(response).to redirect_to users_dossier_recapitulatif_path }
+
+        context 'when champs is mandatory' do
+          let(:procedure) { create(:procedure, :with_two_type_de_piece_justificative, :with_type_de_champ_mandatory, cerfa_flag: true) }
+
+          it { expect(response).not_to redirect_to users_dossier_recapitulatif_path }
+          it { expect(flash[:alert]).to be_present }
+        end
       end
     end
 
     context 'Sauvegarde des pièces justificatives' do
-      let(:all_pj_type){ dossier.procedure.type_de_piece_justificative_ids }
+      let(:all_pj_type) { dossier.procedure.type_de_piece_justificative_ids }
       before do
         post :create, {dossier_id: dossier_id,
-                      nom_projet: nom_projet,
-                      description: description,
-                      'piece_justificative_'+all_pj_type[0].to_s => piece_justificative_0,
-                      'piece_justificative_'+all_pj_type[1].to_s => piece_justificative_1}
+                       nom_projet: nom_projet,
+                       description: description,
+                       'piece_justificative_'+all_pj_type[0].to_s => piece_justificative_0,
+                       'piece_justificative_'+all_pj_type[1].to_s => piece_justificative_1}
         dossier.reload
       end
 

spec/factories/procedure.rb

@@ -27,6 +27,14 @@ FactoryGirl.define do
       end
     end
 
+    trait :with_type_de_champ_mandatory do
+      after(:build) do |procedure, _evaluator|
+        type_de_champ = create(:type_de_champ, mandatory: true)
+
+        procedure.types_de_champ << type_de_champ
+      end
+    end
+
     trait :with_two_type_de_piece_justificative do
       after(:build) do |procedure, _evaluator|
         rib = create(:type_de_piece_justificative, :rib)

spec/factories/type_de_champ.rb

@@ -4,5 +4,6 @@ FactoryGirl.define do
     description 'description de votre projet'
     type_champ 'textarea'
     order_place 1
+    mandatory false
   end
 end