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

champs: put champ label in numeric fields validation messages

Browse source 
Replaces

> La valeur du champ doit être un nombre entier (sans chiffres après
> la virgule)

by

> La valeur du champ « Nombre de parents » doit être un nombre entier
> (sans chiffres après la virgule)
This commit is contained in:
Pierre de La Morinerie 2019-07-10 11:27:36 +00:00
parent 56c846900b
commit 10065df8ce
4 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/models/champs/decimal_number_champ.rb
View file

@ -1,5 +1,11 @@
class Champs::DecimalNumberChamp < Champ class Champs::DecimalNumberChamp < Champ
validates :value, numericality: { allow_nil: true, allow_blank: true } validates :value, numericality: {
allow_nil: true,
allow_blank: true,
message: -> (object, data) {
"« #{object.libelle} » " + object.errors.generate_message(data[:attribute].downcase, :not_a_number)
}
}
def for_export def for_export
processed_value processed_value

9
app/models/champs/integer_number_champ.rb
View file

@ -1,5 +1,12 @@
class Champs::IntegerNumberChamp < Champ class Champs::IntegerNumberChamp < Champ
validates :value, numericality: { only_integer: true, allow_nil: true, allow_blank: true } validates :value, numericality: {
only_integer: true,
allow_nil: true,
allow_blank: true,
message: -> (object, data) {
"« #{object.libelle} » " + object.errors.generate_message(data[:attribute].downcase, :not_an_integer)
}
}
def for_export def for_export
processed_value processed_value

3
spec/models/champs/decimal_number_champ_spec.rb
View file

@ -1,7 +1,7 @@
require 'spec_helper' require 'spec_helper'
describe Champs::DecimalNumberChamp do describe Champs::DecimalNumberChamp do
subject { Champs::DecimalNumberChamp.new(value: value) } subject { build(:champ_decimal_number, value: value).tap(&:valid?) }
describe '#valid?' do describe '#valid?' do
context 'when the value is integer number' do context 'when the value is integer number' do
@ -20,6 +20,7 @@ describe Champs::DecimalNumberChamp do
let(:value) { 'toto' } let(:value) { 'toto' }
it { is_expected.to_not be_valid } it { is_expected.to_not be_valid }
it { expect(subject.errors[:value]).to eq(["« #{subject.libelle} » doit être un nombre"]) }
end end
context 'when the value is blank' do context 'when the value is blank' do

4
spec/models/champs/integer_number_champ_spec.rb
View file

@ -1,7 +1,7 @@
require 'spec_helper' require 'spec_helper'
describe Champs::IntegerNumberChamp do describe Champs::IntegerNumberChamp do
subject { Champs::IntegerNumberChamp.new(value: value) } subject { build(:champ_integer_number, value: value).tap(&:valid?) }
describe '#valid?' do describe '#valid?' do
context 'when the value is integer number' do context 'when the value is integer number' do
@ -14,12 +14,14 @@ describe Champs::IntegerNumberChamp do
let(:value) { 2.6 } let(:value) { 2.6 }
it { is_expected.to_not be_valid } it { is_expected.to_not be_valid }
it { expect(subject.errors[:value]).to eq(["« #{subject.libelle} » doit être un nombre entier (sans chiffres après la virgule)"]) }
end end
context 'when the value is not a number' do context 'when the value is not a number' do
let(:value) { 'toto' } let(:value) { 'toto' }
it { is_expected.to_not be_valid } it { is_expected.to_not be_valid }
it { expect(subject.errors[:value]).to eq(["« #{subject.libelle} » doit être un nombre entier (sans chiffres après la virgule)"]) }
end end
context 'when the value is blank' do context 'when the value is blank' do