Clean up settings after tests

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')
 

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

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

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