Change wording "Valider le dossier" to "Déclarer complet"

This commit is contained in:
Xavier J 2016-10-19 11:23:34 +02:00
parent de07d4437c
commit 6f40424979
3 changed files with 23 additions and 23 deletions

View file

@ -93,22 +93,22 @@
-if gestionnaire_signed_in? -if gestionnaire_signed_in?
-if !@facade.dossier.read_only? -if !@facade.dossier.read_only?
= form_tag(url_for({controller: 'backoffice/dossiers', action: :valid, dossier_id: @facade.dossier.id}), class: 'form-inline', method: 'POST') do = form_tag(url_for({controller: 'backoffice/dossiers', action: :valid, dossier_id: @facade.dossier.id}), class: 'form-inline', method: 'POST') do
%button#action_button.btn.btn-success %button.action_button.btn.btn-success{'data-toggle' => :tooltip, title: 'En cliquant ici, vous figez le dossier et autorisez le dépôt du dossier pour instruction.'}
= 'Valider le dossier' = 'Déclarer complet'
-elsif @facade.dossier.submitted? -elsif @facade.dossier.submitted?
= form_tag(url_for({controller: 'backoffice/dossiers', action: :receive, dossier_id: @facade.dossier.id}), class: 'form-inline', method: 'POST') do = form_tag(url_for({controller: 'backoffice/dossiers', action: :receive, dossier_id: @facade.dossier.id}), class: 'form-inline', method: 'POST') do
%button#action_button.btn.btn-success %button.action_button.btn.btn-success
= 'Notifier de la bonne réception' = 'Notifier de la bonne réception'
-elsif @facade.dossier.received? -elsif @facade.dossier.received?
= form_tag(url_for({controller: 'backoffice/dossiers', action: :close, dossier_id: @facade.dossier.id}), class: 'form-inline action_button', method: 'POST', style: 'display:inline', 'data-toggle' => :tooltip, title: 'Accepter') do = form_tag(url_for({controller: 'backoffice/dossiers', action: :close, dossier_id: @facade.dossier.id}), class: 'form-inline action_button', method: 'POST', style: 'display:inline', 'data-toggle' => :tooltip, title: 'Accepter') do
%button#action_button.btn.btn-success %button.action_button.btn.btn-success
%i.fa.fa-check %i.fa.fa-check
= form_tag(url_for({controller: 'backoffice/dossiers', action: :refuse, dossier_id: @facade.dossier.id}), class: 'form-inline action_button', method: 'POST', style: 'display:inline', 'data-toggle' => :tooltip, title: 'Refuser') do = form_tag(url_for({controller: 'backoffice/dossiers', action: :refuse, dossier_id: @facade.dossier.id}), class: 'form-inline action_button', method: 'POST', style: 'display:inline', 'data-toggle' => :tooltip, title: 'Refuser') do
%button#action_button.btn.btn-danger %button.action_button.btn.btn-danger
%i.fa.fa-times %i.fa.fa-times
= form_tag(url_for({controller: 'backoffice/dossiers', action: :without_continuation, dossier_id: @facade.dossier.id}), class: 'form-inline action_button', method: 'POST', style: 'display:inline', 'data-toggle' => :tooltip, title: 'Classer sans suite') do = form_tag(url_for({controller: 'backoffice/dossiers', action: :without_continuation, dossier_id: @facade.dossier.id}), class: 'form-inline action_button', method: 'POST', style: 'display:inline', 'data-toggle' => :tooltip, title: 'Classer sans suite') do
%button#action_button.btn.btn-warning %button.action_button.btn.btn-warning
%i.fa.fa-circle-o %i.fa.fa-circle-o

View file

@ -18,7 +18,7 @@ RSpec.describe NotificationMailer, type: :mailer do
subject(:subject) { described_class.dossier_validated(dossier) } subject(:subject) { described_class.dossier_validated(dossier) }
it { expect(subject.body).to match("Votre dossier N°#{dossier.id} a été validé par votre accompagnateur.") } it { expect(subject.body).to match("Votre dossier N°#{dossier.id} est prêt à être déposé pour instruction.") }
it { expect(subject.body).to include("Afin de finaliser son dépôt, merci de vous rendre sur #{users_dossier_recapitulatif_url(dossier_id: dossier.id)}") } it { expect(subject.body).to include("Afin de finaliser son dépôt, merci de vous rendre sur #{users_dossier_recapitulatif_url(dossier_id: dossier.id)}") }
it { expect(subject.subject).to eq("Votre dossier TPS N°#{dossier.id} a été validé") } it { expect(subject.subject).to eq("Votre dossier TPS N°#{dossier.id} a été validé") }
end end

View file

@ -59,9 +59,9 @@ describe 'backoffice/dossiers/show.html.haml', type: :view do
it { expect(rendered).to have_content('Nouveau') } it { expect(rendered).to have_content('Nouveau') }
it 'button Valider le dossier is present' do it 'button Déclarer complet is present' do
expect(rendered).to have_css('#action_button') expect(rendered).to have_css('.action_button')
expect(rendered).to have_content('Valider le dossier') expect(rendered).to have_content('Déclarer complet')
end end
end end
@ -74,9 +74,9 @@ describe 'backoffice/dossiers/show.html.haml', type: :view do
it { expect(rendered).to have_content('Répondu') } it { expect(rendered).to have_content('Répondu') }
it 'button Valider le dossier is present' do it 'button Déclarer complet is present' do
expect(rendered).to have_css('#action_button') expect(rendered).to have_css('.action_button')
expect(rendered).to have_content('Valider le dossier') expect(rendered).to have_content('Déclarer complet')
end end
end end
@ -89,9 +89,9 @@ describe 'backoffice/dossiers/show.html.haml', type: :view do
it { expect(rendered).to have_content('Mis à jour') } it { expect(rendered).to have_content('Mis à jour') }
it 'button Valider le dossier is present' do it 'button Déclarer complet is present' do
expect(rendered).to have_css('#action_button') expect(rendered).to have_css('.action_button')
expect(rendered).to have_content('Valider le dossier') expect(rendered).to have_content('Déclarer complet')
end end
end end
@ -104,9 +104,9 @@ describe 'backoffice/dossiers/show.html.haml', type: :view do
it { expect(rendered).to have_content('Figé') } it { expect(rendered).to have_content('Figé') }
it 'button Valider le dossier is not present' do it 'button Déclarer complet is not present' do
expect(rendered).not_to have_css('#action_button') expect(rendered).not_to have_css('.action_button')
expect(rendered).not_to have_content('Valider le dossier') expect(rendered).not_to have_content('Déclarer complet')
end end
end end
@ -120,11 +120,11 @@ describe 'backoffice/dossiers/show.html.haml', type: :view do
it { expect(rendered).to have_content('Déposé') } it { expect(rendered).to have_content('Déposé') }
it 'button notifier de la bonne réception is present' do it 'button notifier de la bonne réception is present' do
expect(rendered).to have_css('#action_button') expect(rendered).to have_css('.action_button')
expect(rendered).to have_content('Notifier de la bonne réception') expect(rendered).to have_content('Notifier de la bonne réception')
end end
it 'button Valider le dossier is not present' do it 'button Déclarer complet is not present' do
expect(rendered).not_to have_content('Accepter le dossier') expect(rendered).not_to have_content('Accepter le dossier')
end end
end end
@ -170,7 +170,7 @@ describe 'backoffice/dossiers/show.html.haml', type: :view do
it { expect(rendered).to have_content('Sans suite') } it { expect(rendered).to have_content('Sans suite') }
it 'button Valider le dossier is not present' do it 'button Déclarer complet is not present' do
expect(rendered).not_to have_css('.action_button[data-toggle="tooltip"][title="Accepter"]') expect(rendered).not_to have_css('.action_button[data-toggle="tooltip"][title="Accepter"]')
expect(rendered).not_to have_css('.action_button[data-toggle="tooltip"][title="Classer sans suite"]') expect(rendered).not_to have_css('.action_button[data-toggle="tooltip"][title="Classer sans suite"]')
expect(rendered).not_to have_css('.action_button[data-toggle="tooltip"][title="Refuser"]') expect(rendered).not_to have_css('.action_button[data-toggle="tooltip"][title="Refuser"]')
@ -186,7 +186,7 @@ describe 'backoffice/dossiers/show.html.haml', type: :view do
it { expect(rendered).to have_content('Refusé') } it { expect(rendered).to have_content('Refusé') }
it 'button Valider le dossier is not present' do it 'button Déclarer complet is not present' do
expect(rendered).not_to have_css('.action_button[data-toggle="tooltip"][title="Accepter"]') expect(rendered).not_to have_css('.action_button[data-toggle="tooltip"][title="Accepter"]')
expect(rendered).not_to have_css('.action_button[data-toggle="tooltip"][title="Classer sans suite"]') expect(rendered).not_to have_css('.action_button[data-toggle="tooltip"][title="Classer sans suite"]')
expect(rendered).not_to have_css('.action_button[data-toggle="tooltip"][title="Refuser"]') expect(rendered).not_to have_css('.action_button[data-toggle="tooltip"][title="Refuser"]')