Revert "Merge pull request #8899 from demarches-simplifiees/8738-validate-adresse-electronique"
This reverts commitd3eda28f35
, reversing changes made to6394996e7f
.
This commit is contained in:
parent
909d726429
commit
f2c1c071b4
4 changed files with 0 additions and 44 deletions
|
@ -21,11 +21,4 @@
|
||||||
# type_de_champ_id :integer
|
# type_de_champ_id :integer
|
||||||
#
|
#
|
||||||
class Champs::EmailChamp < Champs::TextChamp
|
class Champs::EmailChamp < Champs::TextChamp
|
||||||
validates :value,
|
|
||||||
format: {
|
|
||||||
with: Devise.email_regexp,
|
|
||||||
message: I18n.t('invalid', scope: 'activerecord.errors.models.email_champ.attributes.value')
|
|
||||||
},
|
|
||||||
allow_nil: true,
|
|
||||||
if: -> { validation_context != :brouillon }
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -565,10 +565,6 @@ en:
|
||||||
attributes:
|
attributes:
|
||||||
email:
|
email:
|
||||||
taken: ': Invitation already sent'
|
taken: ': Invitation already sent'
|
||||||
email_champ:
|
|
||||||
attributes:
|
|
||||||
value:
|
|
||||||
invalid: "is invalid. Fill in a valid email address, example: john.doe@example.fr"
|
|
||||||
|
|
||||||
user:
|
user:
|
||||||
attributes: &error_attributes
|
attributes: &error_attributes
|
||||||
|
|
|
@ -566,10 +566,6 @@ fr:
|
||||||
attributes:
|
attributes:
|
||||||
email:
|
email:
|
||||||
taken: ': Invitation déjà envoyée'
|
taken: ': Invitation déjà envoyée'
|
||||||
email_champ:
|
|
||||||
attributes:
|
|
||||||
value:
|
|
||||||
invalid: "est invalide. Saisir une adresse éléctronique valide, exemple : john.doe@exemple.fr"
|
|
||||||
user:
|
user:
|
||||||
attributes: &error_attributes
|
attributes: &error_attributes
|
||||||
reset_password_token:
|
reset_password_token:
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
describe Champs::EmailChamp do
|
|
||||||
subject { build(:champ_email, value: value).tap(&:valid?) }
|
|
||||||
|
|
||||||
describe '#valid?' do
|
|
||||||
context 'when the value is an email' do
|
|
||||||
let(:value) { 'jean@dupont.fr' }
|
|
||||||
|
|
||||||
it { is_expected.to be_valid }
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when the value is not an email' do
|
|
||||||
let(:value) { 'jean@' }
|
|
||||||
|
|
||||||
it { is_expected.to_not be_valid }
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when the value is blank' do
|
|
||||||
let(:value) { '' }
|
|
||||||
|
|
||||||
it { is_expected.to_not be_valid }
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when the value is nil' do
|
|
||||||
let(:value) { nil }
|
|
||||||
|
|
||||||
it { is_expected.to be_valid }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
Loading…
Reference in a new issue