diff --git a/app/models/contact.rb b/app/models/contact.rb index c3fe9c3..edb5b1f 100644 --- a/app/models/contact.rb +++ b/app/models/contact.rb @@ -24,10 +24,6 @@ class Contact < ApplicationRecord # Validations # ############### - validates :contact_list, presence: true - - validates :contact_network, presence: true - validates :value, presence: true, uniqueness: { scope: %i[contact_list_id contact_network_id] } diff --git a/spec/models/contact_spec.rb b/spec/models/contact_spec.rb index 9cfe2c8..9962957 100644 --- a/spec/models/contact_spec.rb +++ b/spec/models/contact_spec.rb @@ -6,15 +6,23 @@ RSpec.describe Contact do subject { create :some_contact } describe '#contact_list' do - it { is_expected.to belong_to(:contact_list) } + it { is_expected.to belong_to(:contact_list).required } - it { is_expected.to validate_presence_of :contact_list } + it do + is_expected.to \ + validate_presence_of(:contact_list) + .with_message(:required) + end end describe '#contact_network' do - it { is_expected.to belong_to(:contact_network) } + it { is_expected.to belong_to(:contact_network).required } - it { is_expected.to validate_presence_of :contact_network } + it do + is_expected.to \ + validate_presence_of(:contact_network) + .with_message(:required) + end end describe '#value' do