diff --git a/app/presenters/domain_presenter.rb b/app/presenters/domain_presenter.rb index e81aede33..6729fae0f 100644 --- a/app/presenters/domain_presenter.rb +++ b/app/presenters/domain_presenter.rb @@ -1,5 +1,5 @@ class DomainPresenter - delegate :name, :registrant_name, :registrant_id, :registrant_code, to: :domain + delegate :name, :auth_info, :registrant_name, :registrant_id, :registrant_code, to: :domain def initialize(domain:, view:) @domain = domain diff --git a/app/presenters/registrar/domain_list_csv_presenter.rb b/app/presenters/registrar/domain_list_csv_presenter.rb index d6f0c46bd..392109502 100644 --- a/app/presenters/registrar/domain_list_csv_presenter.rb +++ b/app/presenters/registrar/domain_list_csv_presenter.rb @@ -19,6 +19,7 @@ class Registrar::DomainListCSVPresenter def header columns = %w( domain_name + auth_info registrant_name registrant_code expire_time @@ -32,9 +33,10 @@ class Registrar::DomainListCSVPresenter def domain_to_row(domain:) row = [] row[0] = domain.name - row[1] = domain.registrant_name - row[2] = domain.registrant_code - row[3] = domain.expire_date + row[1] = domain.auth_info + row[2] = domain.registrant_name + row[3] = domain.registrant_code + row[4] = domain.expire_date row CSV::Row.new([], row) diff --git a/config/locales/registrar/domains.en.yml b/config/locales/registrar/domains.en.yml index a420994dd..2b34ddd9f 100644 --- a/config/locales/registrar/domains.en.yml +++ b/config/locales/registrar/domains.en.yml @@ -7,6 +7,7 @@ en: transfer_btn: Transfer csv: domain_name: Domain + auth_info: Auth info registrant_name: Registrant name registrant_code: Registrant code expire_time: Date of expiry diff --git a/spec/presenters/domain_presenter_spec.rb b/spec/presenters/domain_presenter_spec.rb index 717850d17..1ae58c5c0 100644 --- a/spec/presenters/domain_presenter_spec.rb +++ b/spec/presenters/domain_presenter_spec.rb @@ -151,6 +151,7 @@ RSpec.describe DomainPresenter do domain_delegatable_attributes = %i( name + auth_info registrant_name registrant_id registrant_code diff --git a/spec/presenters/registrar/domain_list_csv_presenter_spec.rb b/spec/presenters/registrar/domain_list_csv_presenter_spec.rb index df4eec1fe..8fa1f256d 100644 --- a/spec/presenters/registrar/domain_list_csv_presenter_spec.rb +++ b/spec/presenters/registrar/domain_list_csv_presenter_spec.rb @@ -10,9 +10,10 @@ RSpec.describe Registrar::DomainListCSVPresenter do it 'is present' do columns = [] columns[0] = 'Domain' - columns[1] = 'Registrant name' - columns[2] = 'Registrant code' - columns[3] = 'Date of expiry' + columns[1] = 'Auth info' + columns[2] = 'Registrant name' + columns[3] = 'Registrant code' + columns[4] = 'Date of expiry' columns expect(header).to eq(columns) @@ -27,19 +28,24 @@ RSpec.describe Registrar::DomainListCSVPresenter do expect(row[0]).to eq('test name') end + it 'has domain auth info' do + expect(domain).to receive(:auth_info).and_return('test auth info') + expect(row[1]).to eq('test auth info') + end + it 'has registrant name' do expect(domain).to receive(:registrant_name).and_return('test registrant name') - expect(row[1]).to eq('test registrant name') + expect(row[2]).to eq('test registrant name') end it 'has registrant code' do expect(domain).to receive(:registrant_code).and_return('test registrant code') - expect(row[2]).to eq('test registrant code') + expect(row[3]).to eq('test registrant code') end it 'has expire date' do expect(domain).to receive(:expire_date).and_return('expire date') - expect(row[3]).to eq('expire date') + expect(row[4]).to eq('expire date') end end end