From c240aef717b1c406f3678b6a1e1a84ba573432a8 Mon Sep 17 00:00:00 2001 From: Thiago Youssef Date: Tue, 5 Apr 2022 12:06:53 +0300 Subject: [PATCH] Improve csv tests --- test/fixtures/files/contacts.csv | 8 -------- test/fixtures/files/domains.csv | 5 ----- test/system/admin_area/contacts/csv_test.rb | 13 ++++++++----- test/system/admin_area/domains/csv_test.rb | 12 +++++++----- 4 files changed, 15 insertions(+), 23 deletions(-) diff --git a/test/fixtures/files/contacts.csv b/test/fixtures/files/contacts.csv index 73d9104af..9d8ca5357 100644 --- a/test/fixtures/files/contacts.csv +++ b/test/fixtures/files/contacts.csv @@ -1,10 +1,2 @@ Name,ID,Ident,E-mail,Created at,Registrar,Phone -John,john-001,1234 [US priv],john@inbox.test,2010-07-05 07:30:00,Best Names,+555.555 -William,william-001,12345 [US priv],william@inbox.test,2010-07-05 07:30:00,Best Names,+555.555 -Jane,jane-001,123456 [US priv],jane@mail.test,2010-07-05 07:30:00,Best Names,+555.555 Acme Ltd,acme-ltd-001,1234567 [US org],acme@outlook.test,2010-07-05 07:30:00,Best Names,+555.555 -Jack,jack-001,12345678 [US org],jack@inbox.test,2010-07-05 07:30:00,Good Names,+555.555 -William,william-002,12345 [US priv],william@inbox.test,2010-07-05 07:30:00,Good Names,+555.555 -Registrar Ltd,registrarltd-001,1234567890 [US org],registrar@inbox.test,2010-07-05 07:30:00,Good Names,+555.555 -any,invalid,[ ],invalid@invalid.test,2010-07-05 07:30:00,Best Names, -any,invalid_email,[ ],invalid@invalid.,2010-07-05 07:30:00,Best Names, diff --git a/test/fixtures/files/domains.csv b/test/fixtures/files/domains.csv index 69e9df8a8..b8261ebc2 100644 --- a/test/fixtures/files/domains.csv +++ b/test/fixtures/files/domains.csv @@ -1,7 +1,2 @@ Domain,Registrant,Valid to,Registrar,Created at,Statuses,Contacts code,Force delete date,Force delete data -shop.test,John,2010-07-04 21:00:00,Best Names,2010-07-05 07:30:00,"[""ok""]","[""william-001"", ""jane-001"", ""acme-ltd-001""]",2010-07-08, -airport.test,John,2010-07-05 00:00:00,Best Names,2010-07-05 07:30:00,"[""ok""]","[""john-001"", ""william-001"", ""william-001""]",, -library.test,Acme Ltd,2010-07-05 00:00:00,Best Names,2010-07-05 07:30:00,"[""inactive""]","[""john-001"", ""acme-ltd-001""]",, metro.test,Jack,2010-07-05 00:00:00,Good Names,2010-07-05 07:30:00,[],"[""jack-001"", ""jack-001""]",, -hospital.test,John,2010-07-05 00:00:00,Good Names,2010-07-05 07:30:00,"[""inactive""]","[""john-001"", ""john-001""]",, -invalid.test,any,2010-07-04 21:00:00,Best Names,2010-07-05 07:30:00,"[""inactive""]","[""invalid"", ""invalid""]",, diff --git a/test/system/admin_area/contacts/csv_test.rb b/test/system/admin_area/contacts/csv_test.rb index 552bcf437..de5bd440e 100644 --- a/test/system/admin_area/contacts/csv_test.rb +++ b/test/system/admin_area/contacts/csv_test.rb @@ -1,14 +1,17 @@ require 'application_system_test_case' class ContactsCsvTest < ApplicationSystemTestCase - setup { sign_in users(:admin) } + setup do + sign_in users(:admin) + Domain.destroy_all + Contact.all.each { |contact| contact.destroy unless contact.name == 'Acme Ltd' } + end def test_download_contacts_list_as_csv travel_to Time.zone.parse('2010-07-05 10:30') - Contact.all.each do |contact| - contact.created_at = Time.zone.now - contact.save(:validate => false) - end + contact = Contact.first + contact.created_at = Time.zone.now + contact.save(validate: false) visit admin_contacts_url click_link('CSV') diff --git a/test/system/admin_area/domains/csv_test.rb b/test/system/admin_area/domains/csv_test.rb index 568815dd7..691a8dc50 100644 --- a/test/system/admin_area/domains/csv_test.rb +++ b/test/system/admin_area/domains/csv_test.rb @@ -1,14 +1,16 @@ require 'application_system_test_case' class DomainsCsvTest < ApplicationSystemTestCase - setup { sign_in users(:admin) } + setup do + sign_in users(:admin) + Domain.all.each { |domain| domain.destroy unless domain.name == 'metro.test' } + end def test_download_domains_list_as_csv travel_to Time.zone.parse('2010-07-05 10:30') - Domain.all.each do |domain| - domain.created_at = Time.zone.now - domain.save(:validate => false) - end + domain = Domain.first + domain.created_at = Time.zone.now + domain.save(validate: false) visit admin_domains_url click_link('CSV')