Merge branch 'dev'

demarches-simplifiees · Sep 6, 2018 · 529389a · 529389a
2 parents 8e47dc3 + 7932cd9
commit 529389a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/app/views/new_gestionnaire/dossiers/print.html.haml b/app/views/new_gestionnaire/dossiers/print.html.haml
@@ -84,7 +84,7 @@
   %ul.messages-list
     - @dossier.commentaires.each do |commentaire|
       %li
-        = render partial: "new_gestionnaire/shared/messages/message", locals: { commentaire: commentaire, user_email: current_gestionnaire.email, messagerie_seen_at: nil }
+        = render partial: "shared/dossiers/messages/message", locals: { commentaire: commentaire, user_email: current_gestionnaire.email, messagerie_seen_at: nil }
 
 %script{ type: "text/javascript" }
   window.print();
diff --git a/spec/factories/dossier.rb b/spec/factories/dossier.rb
@@ -64,6 +64,12 @@
       end
     end
 
+    trait :with_commentaires do
+      after(:create) do |dossier, _evaluator|
+        dossier.commentaires += create_list(:commentaire, 2)
+      end
+    end
+
     trait :followed do
       after(:create) do |dossier, _evaluator|
         g = create(:gestionnaire)

diff --git a/spec/views/new_gestionnaire/dossiers/print.html.haml_spec.rb b/spec/views/new_gestionnaire/dossiers/print.html.haml_spec.rb
@@ -3,7 +3,7 @@
 
   context "with a dossier" do
     let(:current_gestionnaire) { create(:gestionnaire) }
-    let(:dossier) { create(:dossier, :en_instruction) }
+    let(:dossier) { create(:dossier, :en_instruction, :with_commentaires) }
 
     before do
       assign(:dossier, dossier)