Clean up settings after tests

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

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,

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

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'

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