MandatoryAttachment: group missing errors logic together

and show errors only if not draft

spec/services/pieces_justificatives_service_spec.rb

@@ -8,74 +8,85 @@ describe PiecesJustificativesService do
     allow(ClamavService).to receive(:safe_file?).and_return(safe_file)
   end
 
+  let(:hash) { {} }
+  let!(:tpj_not_mandatory) do
+    TypeDePieceJustificative.create(libelle: 'not mandatory', mandatory: false)
+  end
+  let!(:tpj_mandatory) do
+    TypeDePieceJustificative.create(libelle: 'justificatif', mandatory: true)
+  end
+  let(:procedure) { Procedure.create(types_de_piece_justificative: tpjs) }
+  let(:dossier) { Dossier.create(procedure: procedure) }
+  let(:errors) { PiecesJustificativesService.upload!(dossier, user, hash) }
+  let(:tpjs) { [tpj_not_mandatory] }
+
   describe 'self.upload!' do
-    let(:hash) { {} }
-    let!(:tpj_not_mandatory) do
-      TypeDePieceJustificative.create(libelle: 'not mandatory', mandatory: false)
-    end
-    let!(:tpj_mandatory) do
-      TypeDePieceJustificative.create(libelle: 'justificatif', mandatory: true)
-    end
-    let(:procedure) { Procedure.create(types_de_piece_justificative: tpjs) }
-    let(:dossier) { Dossier.create(procedure: procedure) }
-    let(:errors) { PiecesJustificativesService.upload!(dossier, user, hash) }
-
-    context 'when no piece justificative is required' do
-      let(:tpjs) { [tpj_not_mandatory] }
-
-      context 'when no params are given' do
-        it { expect(errors).to eq([]) }
-      end
-
-      context 'when sometihing wrong with file save' do
-        let(:hash) do
-          {
-            "piece_justificative_#{tpj_not_mandatory.id}" =>
-              double(path: '', original_filename: 'filename')
-          }
-        end
-
-        it { expect(errors).to match(["le fichier filename (not mandatory) n'a pas pu être sauvegardé"]) }
-      end
-
-      context 'when a virus is provided' do
-        let(:safe_file) { false }
-        let(:hash) do
-          {
-            "piece_justificative_#{tpj_not_mandatory.id}" =>
-              double(path: '', original_filename: 'bad_file')
-          }
-        end
-
-        it { expect(errors).to match(['bad_file : virus détecté']) }
-      end
+    context 'when no params are given' do
+      it { expect(errors).to eq([]) }
     end
 
-    context 'when a piece justificative is required' do
-      let(:tpjs) { [tpj_mandatory] }
-
-      context 'when no params are given' do
-        it { expect(errors).to match(['La pièce jointe justificatif doit être fournie.']) }
+    context 'when there is something wrong with file save' do
+      let(:hash) do
+        {
+          "piece_justificative_#{tpj_not_mandatory.id}" =>
+            double(path: '', original_filename: 'filename')
+        }
       end
 
-      context 'when the piece justificative is provided' do
-        before :each do
-          # we are messing around piece_justificative
-          # because directly doubling carrierwave params seems complicated
+      it { expect(errors).to match(["le fichier filename (not mandatory) n'a pas pu être sauvegardé"]) }
+    end
 
-          allow(PiecesJustificativesService).to receive(:save_pj).and_return(nil)
-          piece_justificative_double = double(type_de_piece_justificative: tpj_mandatory)
-          expect(dossier).to receive(:pieces_justificatives).and_return([piece_justificative_double])
-        end
+    context 'when a virus is provided' do
+      let(:safe_file) { false }
+      let(:hash) do
+        {
+          "piece_justificative_#{tpj_not_mandatory.id}" =>
+            double(path: '', original_filename: 'bad_file')
+        }
+      end
 
-        let(:hash) do
-          {
-            "piece_justificative_#{tpj_mandatory.id}" => double(path: '')
-          }
-        end
+      it { expect(errors).to match(['bad_file : virus détecté']) }
+    end
 
-        it { expect(errors).to match([]) }
+    context 'when a regular file is provided' do
+      let(:content) { double(path: '', original_filename: 'filename') }
+      let(:hash) do
+        {
+          "piece_justificative_#{tpj_not_mandatory.id}" =>
+            content
+        }
+      end
+
+      before :each do
+        expect(PiecesJustificativesService).to receive(:save_pj)
+          .with(content, dossier, tpj_not_mandatory, user)
+          .and_return(nil)
+      end
+
+      it 'is saved' do
+        expect(errors).to match([])
       end
     end
   end
+
+  describe 'missing_pj_error_messages' do
+    let(:errors) { PiecesJustificativesService.missing_pj_error_messages(dossier) }
+    let(:tpjs) { [tpj_mandatory] }
+
+    context 'when no params are given' do
+      it { expect(errors).to match(['La pièce jointe justificatif doit être fournie.']) }
+    end
+
+    context 'when the piece justificative is provided' do
+      before :each do
+        # we are messing around piece_justificative
+        # because directly doubling carrierwave params seems complicated
+
+        piece_justificative_double = double(type_de_piece_justificative: tpj_mandatory)
+        expect(dossier).to receive(:pieces_justificatives).and_return([piece_justificative_double])
+      end
+
+      it { expect(errors).to match([]) }
+    end
+  end
 end