diff --git a/test/integration/api/domain_transfers_test.rb b/test/integration/api/domain_transfers_test.rb index 12c8351f6..7cd0874c1 100644 --- a/test/integration/api/domain_transfers_test.rb +++ b/test/integration/api/domain_transfers_test.rb @@ -4,9 +4,14 @@ class APIDomainTransfersTest < ApplicationIntegrationTest setup do @domain = domains(:shop) @new_registrar = registrars(:goodnames) + @original_transfer_wait_time = Setting.transfer_wait_time Setting.transfer_wait_time = 0 # Auto-approval end + teardown do + Setting.transfer_wait_time = @original_transfer_wait_time + end + def test_returns_domain_transfers post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } assert_response 200 diff --git a/test/integration/api/v1/registrant/contacts/update_test.rb b/test/integration/api/v1/registrant/contacts/update_test.rb index d87b787f0..679ef36e1 100644 --- a/test/integration/api/v1/registrant/contacts/update_test.rb +++ b/test/integration/api/v1/registrant/contacts/update_test.rb @@ -5,14 +5,14 @@ class RegistrantApiV1ContactUpdateTest < ActionDispatch::IntegrationTest setup do @contact = contacts(:john) - @original_address_processing_setting = Setting.address_processing + @original_address_processing = Setting.address_processing @original_fax_enabled_setting = ENV['fax_enabled'] @user = users(:registrant) end teardown do - Setting.address_processing = @original_address_processing_setting + Setting.address_processing = @original_address_processing ENV['fax_enabled'] = @original_fax_enabled_setting end diff --git a/test/integration/epp/domain/delete/base_test.rb b/test/integration/epp/domain/delete/base_test.rb index a194e8ce2..2ee71fcc2 100644 --- a/test/integration/epp/domain/delete/base_test.rb +++ b/test/integration/epp/domain/delete/base_test.rb @@ -5,12 +5,12 @@ class EppDomainDeleteBaseTest < EppTestCase setup do @domain = domains(:shop) - @original_confirmation_setting = Setting.request_confirmation_on_domain_deletion_enabled + @original_domain_delete_confirmation = Setting.request_confirmation_on_domain_deletion_enabled ActionMailer::Base.deliveries.clear end teardown do - Setting.request_confirmation_on_domain_deletion_enabled = @original_confirmation_setting + Setting.request_confirmation_on_domain_deletion_enabled = @original_domain_delete_confirmation end def test_bypasses_domain_and_registrant_and_contacts_validation diff --git a/test/integration/epp/domain/update/base_test.rb b/test/integration/epp/domain/update/base_test.rb index f085c67c5..e68a62306 100644 --- a/test/integration/epp/domain/update/base_test.rb +++ b/test/integration/epp/domain/update/base_test.rb @@ -3,11 +3,18 @@ require 'test_helper' class EppDomainUpdateBaseTest < EppTestCase include ActionMailer::TestHelper - def setup + setup do @domain = domains(:shop) + @original_registrant_change_verification = + Setting.request_confrimation_on_registrant_change_enabled ActionMailer::Base.deliveries.clear end + teardown do + Setting.request_confrimation_on_registrant_change_enabled = + @original_registrant_change_verification + end + def test_update_domain request_xml = <<-XML diff --git a/test/integration/registrar_area/sign_in/id_card_test.rb b/test/integration/registrar_area/sign_in/id_card_test.rb index 750712f34..0a38e4105 100644 --- a/test/integration/registrar_area/sign_in/id_card_test.rb +++ b/test/integration/registrar_area/sign_in/id_card_test.rb @@ -3,6 +3,11 @@ require 'test_helper' class RegistrarAreaIdCardSignInTest < ApplicationIntegrationTest setup do @user = users(:api_bestnames) + @original_registrar_area_ip_whitelist = Setting.registrar_ip_whitelist_enabled + end + + teardown do + Setting.registrar_ip_whitelist_enabled = @original_registrar_area_ip_whitelist end def test_signs_in_a_user_when_id_card_owner_is_found @@ -39,8 +44,6 @@ class RegistrarAreaIdCardSignInTest < ApplicationIntegrationTest get registrar_root_path assert_redirected_to new_registrar_user_session_path - - Setting.registrar_ip_whitelist_enabled = false end def test_does_not_sign_in_a_user_when_certificate_is_absent diff --git a/test/models/deposit_test.rb b/test/models/deposit_test.rb index b7510b960..d8fc2d02a 100644 --- a/test/models/deposit_test.rb +++ b/test/models/deposit_test.rb @@ -5,14 +5,12 @@ class DepositTest < ActiveSupport::TestCase super @deposit = Deposit.new(registrar: registrars(:bestnames)) - @minimum_deposit = Setting.minimum_deposit + @original_minimum_deposit = Setting.minimum_deposit Setting.minimum_deposit = 1.00 end - def teardown - super - - Setting.minimum_deposit = @minimum_deposit + teardown do + Setting.minimum_deposit = @original_minimum_deposit end def test_validate_amount_cannot_be_lower_than_0_01 diff --git a/test/models/domain_cron_test.rb b/test/models/domain_cron_test.rb index 60cebc998..742bf2eaf 100644 --- a/test/models/domain_cron_test.rb +++ b/test/models/domain_cron_test.rb @@ -5,9 +5,14 @@ class DomainCronTest < ActiveSupport::TestCase setup do @domain = domains(:shop) + @original_expire_pending_confirmation = Setting.expire_pending_confirmation ActionMailer::Base.deliveries.clear end + teardown do + Setting.expire_pending_confirmation = @original_expire_pending_confirmation + end + def test_clean_expired_pendings_notifies_registrant_by_email Setting.expire_pending_confirmation = 0 @domain.update!(registrant_verification_asked_at: Time.zone.now, diff --git a/test/models/registrar_test.rb b/test/models/registrar_test.rb index ae68ebeea..eaed654ec 100644 --- a/test/models/registrar_test.rb +++ b/test/models/registrar_test.rb @@ -3,6 +3,13 @@ require 'test_helper' class RegistrarTest < ActiveSupport::TestCase setup do @registrar = registrars(:bestnames) + @original_default_language = Setting.default_language + @original_days_to_keep_invoices_active = Setting.days_to_keep_invoices_active + end + + teardown do + Setting.default_language = @original_default_language + Setting.days_to_keep_invoices_active = @original_days_to_keep_invoices_active end def test_valid_registrar_is_valid @@ -120,15 +127,12 @@ class RegistrarTest < ActiveSupport::TestCase def test_issues_new_invoice travel_to Time.zone.parse('2010-07-05') - @original_days_to_keep_invoices_active_setting = Setting.days_to_keep_invoices_active Setting.days_to_keep_invoices_active = 10 invoice = @registrar.issue_prepayment_invoice(100) assert_equal Date.parse('2010-07-05'), invoice.issue_date assert_equal Date.parse('2010-07-15'), invoice.due_date - - Setting.days_to_keep_invoices_active = @original_days_to_keep_invoices_active_setting end def test_issues_e_invoice_along_with_invoice diff --git a/test/models/registry_test.rb b/test/models/registry_test.rb index 5ec10ec9e..1fe6e9ef2 100644 --- a/test/models/registry_test.rb +++ b/test/models/registry_test.rb @@ -1,6 +1,16 @@ require 'test_helper' class RegistryTest < ActiveSupport::TestCase + setup do + @original_registry_vat_rate = Setting.registry_vat_prc + @original_registry_country_code = Setting.registry_country_code + end + + teardown do + Setting.registry_vat_prc = @original_registry_vat_rate + Setting.registry_country_code = @original_registry_country_code + end + def test_returns_current_registry Setting.registry_vat_prc = 0.2 Setting.registry_country_code = 'US' diff --git a/test/models/whois/record_test.rb b/test/models/whois/record_test.rb index 43707b186..5f2454105 100644 --- a/test/models/whois/record_test.rb +++ b/test/models/whois/record_test.rb @@ -7,12 +7,12 @@ class Whois::RecordTest < ActiveSupport::TestCase @whois_record = whois_records(:one) @auction = auctions(:one) - @original_disclaimer_setting = Setting.registry_whois_disclaimer + @original_disclaimer = Setting.registry_whois_disclaimer Setting.registry_whois_disclaimer = 'disclaimer' end teardown do - Setting.registry_whois_disclaimer = @original_disclaimer_setting + Setting.registry_whois_disclaimer = @original_disclaimer end def test_reads_disclaimer_setting diff --git a/test/services/overdue_invoice_canceller_test.rb b/test/services/overdue_invoice_canceller_test.rb index 6dd2ea3b4..debade3a9 100644 --- a/test/services/overdue_invoice_canceller_test.rb +++ b/test/services/overdue_invoice_canceller_test.rb @@ -3,6 +3,11 @@ require 'test_helper' class OverdueInvoiceCancellerTest < ActiveSupport::TestCase setup do @invoice = invoices(:one) + @original_days_to_keep_overdue_invoices_active = Setting.days_to_keep_overdue_invoices_active + end + + teardown do + Setting.days_to_keep_overdue_invoices_active = @original_days_to_keep_overdue_invoices_active end def test_default_delay diff --git a/test/system/admin_area/registrars_test.rb b/test/system/admin_area/registrars_test.rb index 0982fe624..570517078 100644 --- a/test/system/admin_area/registrars_test.rb +++ b/test/system/admin_area/registrars_test.rb @@ -5,9 +5,14 @@ class AdminRegistrarsSystemTest < ApplicationSystemTestCase setup do @registrar = registrars(:bestnames) + @original_default_language = Setting.default_language sign_in users(:admin) end + teardown do + Setting.default_language = @original_default_language + end + def test_creates_new_registrar assert_nil Registrar.find_by(name: 'Acme Ltd') diff --git a/test/system/registrant_area/contacts/update_test.rb b/test/system/registrant_area/contacts/update_test.rb index f56e117ed..a7cee049e 100644 --- a/test/system/registrant_area/contacts/update_test.rb +++ b/test/system/registrant_area/contacts/update_test.rb @@ -6,7 +6,7 @@ class RegistrantAreaContactUpdateTest < ApplicationIntegrationTest @contact = contacts(:john) sign_in users(:registrant) - @original_address_processing_setting = Setting.address_processing + @original_address_processing = Setting.address_processing @original_fax_enabled_setting = ENV['fax_enabled'] @original_registrant_api_base_url_setting = ENV['registrant_api_base_url'] @@ -14,7 +14,7 @@ class RegistrantAreaContactUpdateTest < ApplicationIntegrationTest end teardown do - Setting.address_processing = @original_address_processing_setting + Setting.address_processing = @original_address_processing ENV['fax_enabled'] = @original_fax_enabled_setting ENV['registrant_api_base_url'] = @original_registrant_api_base_url_setting end diff --git a/test/system/registrar_area/base_test.rb b/test/system/registrar_area/base_test.rb index 35b64df69..67b19a044 100644 --- a/test/system/registrar_area/base_test.rb +++ b/test/system/registrar_area/base_test.rb @@ -1,6 +1,14 @@ require 'application_system_test_case' class RegistrarAreaBaseTestTest < ApplicationSystemTestCase + setup do + @original_registrar_area_ip_whitelist = Setting.registrar_ip_whitelist_enabled + end + + teardown do + Setting.registrar_ip_whitelist_enabled = @original_registrar_area_ip_whitelist + end + def test_user_cannot_access_without_ip_address_being_whitelisted Setting.registrar_ip_whitelist_enabled = true WhiteIp.delete_all diff --git a/test/system/registrar_area/billing/balance_top_up_test.rb b/test/system/registrar_area/billing/balance_top_up_test.rb index 2614b8701..be378df97 100644 --- a/test/system/registrar_area/billing/balance_top_up_test.rb +++ b/test/system/registrar_area/billing/balance_top_up_test.rb @@ -3,10 +3,14 @@ require 'application_system_test_case' class BalanceTopUpTest < ApplicationSystemTestCase setup do sign_in users(:api_bestnames) + @original_registry_vat_rate = Setting.registry_vat_prc + end + + teardown do + Setting.registry_vat_prc = @original_registry_vat_rate end def test_creates_new_invoice - original_vat_prc = Setting.registry_vat_prc Setting.registry_vat_prc = 0.1 visit registrar_invoices_url @@ -22,7 +26,5 @@ class BalanceTopUpTest < ApplicationSystemTestCase assert_equal BigDecimal(10), invoice.vat_rate assert_equal BigDecimal('28.05'), invoice.total assert_text 'Please pay the following invoice' - - Setting.registry_vat_prc = original_vat_prc end end