feedback PR Colin

This commit is contained in:
Lisa Durand 2023-06-29 13:53:23 +02:00
parent e03696c380
commit 0a0665bb4d
4 changed files with 11 additions and 13 deletions

View file

@ -13,11 +13,11 @@ class Dsfr::AlertComponent < ApplicationComponent
end
def alert_class(state)
if size == 'small'
["fr-alert fr-alert--sm fr-alert--#{state}", extra_class_names].compact.flatten
else
["fr-alert fr-alert--#{state}", extra_class_names].compact.flatten
end
class_names(
"fr-alert fr-alert--#{state}" => true,
"fr-alert--sm" => size == :sm,
extra_class_names => true
)
end
private

View file

@ -1,5 +1,5 @@
%div{ class: alert_class(state) }
- if size != 'small'
- if size != :sm
= content_tag(heading_level, class: 'fr-alert__title') do
= "#{prefix_for_state}#{title}"
= body

View file

@ -52,20 +52,20 @@
= pending_correction_badge(:for_user)
- if dossier.procedure.close?
= render Dsfr::AlertComponent.new(state: :info, size: 'small', extra_class_names: "fr-mb-2w") do |c|
= render Dsfr::AlertComponent.new(state: :info, size: :sm, extra_class_names: "fr-mb-2w") do |c|
- c.body do
%p
= t('views.users.dossiers.dossiers_list.procedure_closed')
- if dossier.pending_correction?
= render Dsfr::AlertComponent.new(state: :warning, size: 'small', extra_class_names: "fr-mb-2w") do |c|
= render Dsfr::AlertComponent.new(state: :warning, size: :sm, extra_class_names: "fr-mb-2w") do |c|
- c.body do
%p
= t('views.users.dossiers.dossiers_list.pending_correction')
- if dossier.transfer.present?
- if @statut == "dossiers-transferes"
= render Dsfr::AlertComponent.new(state: :info, size: 'small', extra_class_names: "fr-mt-2w") do |c|
= render Dsfr::AlertComponent.new(state: :info, size: :sm) do |c|
- c.body do
%p
= t('views.users.dossiers.transfers.receiver_demande_en_cours', id: dossier.id, email: dossier.user.email)
@ -73,7 +73,7 @@
= link_to t('views.users.dossiers.transfers.accept'), transfer_path(dossier.transfer), class: "fr-link fr-mr-1w", method: :put
= link_to t('views.users.dossiers.transfers.reject'), transfer_path(dossier.transfer), class: "fr-link", method: :delete
- else
= render Dsfr::AlertComponent.new(state: :info, size: 'small', extra_class_names: "fr-mb-2w") do |c|
= render Dsfr::AlertComponent.new(state: :info, size: :sm, extra_class_names: "fr-mb-2w") do |c|
- c.body do
%p
= t('views.users.dossiers.transfers.sender_demande_en_cours', id: dossier.id, email: dossier.transfer.email)

View file

@ -179,14 +179,12 @@ describe 'user access to the list of their dossiers', js: true do
context 'when user clicks on clone button', js: true do
scenario 'the dossier is cloned' do
expect(Dossier.count).to eq(8)
within(:css, ".card", match: :first) do
click_on 'Autres actions'
click_on 'Dupliquer ce dossier'
expect { click_on 'Dupliquer ce dossier' }.to change { dossier_brouillon.user.dossiers.count }.by(1)
end
expect(page).to have_content("Votre dossier a bien été dupliqué. Vous pouvez maintenant le vérifier, ladapter puis le déposer.")
expect(Dossier.count).to eq(9)
end
end
end