From 1f0e46a4ff85a500b3edc157e1522131a196157a Mon Sep 17 00:00:00 2001 From: simon lehericey Date: Fri, 1 Jun 2018 10:51:04 +0200 Subject: [PATCH] Procedure: required juridique stuff only if needed --- app/models/procedure.rb | 2 +- spec/models/procedure_spec.rb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/models/procedure.rb b/app/models/procedure.rb index 32c90e489..fe39040b3 100644 --- a/app/models/procedure.rb +++ b/app/models/procedure.rb @@ -357,7 +357,7 @@ class Procedure < ApplicationRecord end def check_juridique - if cadre_juridique.blank? && !deliberation.attached? + if juridique_required? && (cadre_juridique.blank? && !deliberation.attached?) errors.add(:cadre_juridique, " : veuillez remplir le texte de loi ou la délibération") end end diff --git a/spec/models/procedure_spec.rb b/spec/models/procedure_spec.rb index ac091cb6d..6658356e2 100644 --- a/spec/models/procedure_spec.rb +++ b/spec/models/procedure_spec.rb @@ -193,6 +193,12 @@ describe Procedure do end end end + + context 'when juridique_required is false' do + let(:procedure) { build(:procedure, juridique_required: false, cadre_juridique: nil) } + + it { expect(procedure.valid?).to eq(true) } + end end describe '#types_de_champ_ordered' do