diff --git a/app/api/repp/contact_v1.rb b/app/api/repp/contact_v1.rb index 6aa934609..ea7bfdc43 100644 --- a/app/api/repp/contact_v1.rb +++ b/app/api/repp/contact_v1.rb @@ -17,7 +17,7 @@ module Repp if params[:details] == 'true' contacts = current_user.registrar.contacts.limit(limit).offset(offset) - unless Contact.address_processing + unless Contact.address_processing? attributes = Contact.attribute_names - Contact.address_attribute_names contacts = contacts.select(attributes) end diff --git a/app/controllers/epp/contacts_controller.rb b/app/controllers/epp/contacts_controller.rb index e719d8180..da840ade6 100644 --- a/app/controllers/epp/contacts_controller.rb +++ b/app/controllers/epp/contacts_controller.rb @@ -22,7 +22,7 @@ class Epp::ContactsController < EppController @contact.add_legal_file_to_new(frame) - @response_code = if Contact.address_processing + @response_code = if Contact.address_processing? 1000 else frame.css('postalInfo addr').size != 0 ? 1100 : 1000 diff --git a/app/models/contact.rb b/app/models/contact.rb index 72c7a318f..ee9410e98 100644 --- a/app/models/contact.rb +++ b/app/models/contact.rb @@ -258,7 +258,7 @@ class Contact < ActiveRecord::Base pluck(:email) end - def address_processing + def address_processing? Setting.address_processing end diff --git a/spec/api/repp/contact_v1_spec.rb b/spec/api/repp/contact_v1_spec.rb index 59d39cc60..455b7bd91 100644 --- a/spec/api/repp/contact_v1_spec.rb +++ b/spec/api/repp/contact_v1_spec.rb @@ -23,7 +23,7 @@ RSpec.describe Repp::ContactV1, db: true do context 'when address processing is enabled' do before do - expect(Contact).to receive(:address_processing).and_return(true) + expect(Contact).to receive(:address_processing?).and_return(true) get '/repp/v1/contacts', { limit: 1, details: true }, { 'HTTP_AUTHORIZATION' => http_auth_key } end @@ -34,7 +34,7 @@ RSpec.describe Repp::ContactV1, db: true do context 'when address processing is disabled' do before do - expect(Contact).to receive(:address_processing).and_return(false) + expect(Contact).to receive(:address_processing?).and_return(false) get '/repp/v1/contacts', { limit: 1, details: true }, { 'HTTP_AUTHORIZATION' => http_auth_key } end diff --git a/spec/models/contact_spec.rb b/spec/models/contact_spec.rb index 2f3d7efe3..fa8524f78 100644 --- a/spec/models/contact_spec.rb +++ b/spec/models/contact_spec.rb @@ -384,13 +384,13 @@ RSpec.describe Contact, db: false do end end - describe '::address_processing' do + describe '::address_processing?' do before do Setting.address_processing = 'test' end it 'returns setting value' do - expect(described_class.address_processing).to eq('test') + expect(described_class.address_processing?).to eq('test') end end