diff --git a/spec/lib/e164_phone_number.rb b/spec/lib/validators/e164.rb similarity index 94% rename from spec/lib/e164_phone_number.rb rename to spec/lib/validators/e164.rb index e8740517b..bfb4914a3 100644 --- a/spec/lib/e164_phone_number.rb +++ b/spec/lib/validators/e164.rb @@ -1,6 +1,6 @@ # https://en.wikipedia.org/wiki/E.164 -RSpec.shared_examples 'e164 phone number' do +RSpec.shared_examples 'e164' do describe 'validation' do it 'rejects invalid format' do model.send("#{attribute}=", '+.1') diff --git a/spec/models/contact/phone_spec.rb b/spec/models/contact/contact_phone_spec.rb similarity index 60% rename from spec/models/contact/phone_spec.rb rename to spec/models/contact/contact_phone_spec.rb index f084ce64b..cc1ecbec0 100644 --- a/spec/models/contact/phone_spec.rb +++ b/spec/models/contact/contact_phone_spec.rb @@ -1,11 +1,11 @@ require 'rails_helper' -require 'lib/e164_phone_number' +require 'lib/validators/e164' RSpec.describe Contact do let(:contact) { described_class.new } describe 'phone', db: false do - it_behaves_like 'e164 phone number' do + it_behaves_like 'e164' do let(:model) { contact } let(:attribute) { :phone } end @@ -29,17 +29,5 @@ RSpec.describe Contact do contact.validate expect(contact.errors).to be_added(:phone, :invalid) end - - it 'translates :blank error message' do - contact.phone = nil - contact.validate - expect(contact.errors.generate_message(:phone, :blank)).to eq('Required parameter missing - phone') - end - - it 'translates :invalid error message' do - contact.phone = nil - contact.validate - expect(contact.errors.generate_message(:phone, :invalid)).to eq('Phone nr is invalid') - end end end