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

Merge branch 'main' into fix-experts-lookup

Browse source
This commit is contained in:
Kara Diaby 2021-03-18 20:46:56 +01:00 committed by GitHub
commit 38837443aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/champ.rb
View file

@ -94,6 +94,8 @@ class Champ < ApplicationRecord
case type_de_champ.type_champ case type_de_champ.type_champ
when TypeDeChamp.type_champs.fetch(:carte) when TypeDeChamp.type_champs.fetch(:carte)
geo_areas.blank? || value == '[]' geo_areas.blank? || value == '[]'
when TypeDeChamp.type_champs.fetch(:multiple_drop_down_list)
value.blank? || value == '[]'
else else
value.blank? value.blank?
end end

6
spec/models/champ_shared_example.rb
View file

@ -15,6 +15,12 @@ shared_examples 'champ_spec' do
it { expect(champ.mandatory_and_blank?).to be(true) } it { expect(champ.mandatory_and_blank?).to be(true) }
end end
context 'when multiple_drop_down_list mandatory and blank' do
let(:type_de_champ) { build(:type_de_champ_multiple_drop_down_list, mandatory: mandatory) }
let(:value) { '[]' }
it { expect(champ.mandatory_and_blank?).to be(true) }
end
context 'when not blank' do context 'when not blank' do
let(:value) { 'yop' } let(:value) { 'yop' }
it { expect(champ.mandatory_and_blank?).to be(false) } it { expect(champ.mandatory_and_blank?).to be(false) }