DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'dev'

Browse source
This commit is contained in:
gregoirenovel 2018-09-06 12:54:33 +02:00
commit 529389accc
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/new_gestionnaire/dossiers/print.html.haml
View file

@ -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();

6
spec/factories/dossier.rb
View file

@ -64,6 +64,12 @@ FactoryBot.define do
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)

2
spec/views/new_gestionnaire/dossiers/print.html.haml_spec.rb
View file

@ -3,7 +3,7 @@ describe 'new_gestionnaire/dossiers/print.html.haml', type: :view do
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)