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

fix(conditional): handle incorrect user input

Browse source
This commit is contained in:
simon lehericey 2022-07-21 15:48:37 +02:00 committed by LeSim
parent df7e5256ea
commit 0d3856e84a
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models/logic/champ_value.rb
View file

@ -25,6 +25,7 @@ class Logic::ChampValue < Logic::Term
targeted_champ = champ(champs) targeted_champ = champ(champs)
return nil if !targeted_champ.visible? return nil if !targeted_champ.visible?
return nil if targeted_champ.blank?
case type_de_champ.type_champ case type_de_champ.type_champ
when MANAGED_TYPE_DE_CHAMP.fetch(:yes_no), when MANAGED_TYPE_DE_CHAMP.fetch(:yes_no),

6
spec/models/logic/champ_value_spec.rb
View file

@ -33,6 +33,12 @@ describe Logic::ChampValue do
it { expect(champ_value(champ.stable_id).type).to eq(:number) } it { expect(champ_value(champ.stable_id).type).to eq(:number) }
it { is_expected.to eq(42) } it { is_expected.to eq(42) }
context 'with a blank value' do
let(:champ) { create(:champ_integer_number, value: '') }
it { is_expected.to be nil }
end
end end
context 'decimal tdc' do context 'decimal tdc' do

13
spec/system/users/brouillon_spec.rb
View file

@ -279,12 +279,14 @@ describe 'The user' do
p.draft_revision.add_type_de_champ(type_champ: :integer_number, libelle: 'age') p.draft_revision.add_type_de_champ(type_champ: :integer_number, libelle: 'age')
p.draft_revision.add_type_de_champ(type_champ: :yes_no, libelle: 'permis de conduire') p.draft_revision.add_type_de_champ(type_champ: :yes_no, libelle: 'permis de conduire')
p.draft_revision.add_type_de_champ(type_champ: :integer_number, libelle: 'tonnage') p.draft_revision.add_type_de_champ(type_champ: :integer_number, libelle: 'tonnage')
p.draft_revision.add_type_de_champ(type_champ: :text, libelle: 'parking')
end end
age, permis, tonnage = procedure.draft_revision.types_de_champ.all age, permis, tonnage, parking = procedure.draft_revision.types_de_champ.all
permis.update(condition: greater_than_eq(champ_value(age.stable_id), constant(18))) permis.update(condition: greater_than_eq(champ_value(age.stable_id), constant(18)))
tonnage.update(condition: ds_eq(champ_value(permis.stable_id), constant(true))) tonnage.update(condition: ds_eq(champ_value(permis.stable_id), constant(true)))
parking.update(condition: less_than_eq(champ_value(tonnage.stable_id), constant(20)))
procedure.publish! procedure.publish!
@ -294,8 +296,6 @@ describe 'The user' do
scenario 'fill a dossier', js: true do scenario 'fill a dossier', js: true do
log_in(user, procedure) log_in(user, procedure)
age, permis, tonnage = user.dossiers.first.champs.to_a
fill_individual fill_individual
expect(page).to have_css('label', text: 'age', visible: true) expect(page).to have_css('label', text: 'age', visible: true)
@ -310,6 +310,13 @@ describe 'The user' do
expect(page).to have_css('label', text: 'permis de conduire', visible: true) expect(page).to have_css('label', text: 'permis de conduire', visible: true)
expect(page).to have_css('label', text: 'tonnage', visible: true) expect(page).to have_css('label', text: 'tonnage', visible: true)
fill_in('tonnage', with: '1')
expect(page).to have_css('label', text: 'parking', visible: true)
# try to fill with invalid data
fill_in('tonnage', with: 'a')
expect(page).to have_no_css('label', text: 'parking', visible: true)
fill_in('age', with: '2') fill_in('age', with: '2')
expect(page).to have_no_css('label', text: 'permis de conduire', visible: true) expect(page).to have_no_css('label', text: 'permis de conduire', visible: true)
expect(page).to have_no_css('label', text: 'tonnage', visible: true) expect(page).to have_no_css('label', text: 'tonnage', visible: true)