X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/634173cfde590f65236fe4c3c4d53b1d185264f5..bd1f568c0a91d8d58b05912fdae1a6912edd3e62:/test/test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 222e65764..e1bc91917 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -32,6 +32,7 @@ ENV["RAILS_ENV"] = "test"
 require_relative "../config/environment"
 require "rails/test_help"
 require "webmock/minitest"
+require "minitest/focus" unless ENV["CI"]
 
 WebMock.disable_net_connect!(:allow_localhost => true)
 
@@ -374,14 +375,21 @@ module ActiveSupport
       end
     end
 
-    def with_user_account_deletion_delay(value)
-      freeze_time
-      default_value = Settings.user_account_deletion_delay
-      Settings.user_account_deletion_delay = value
+    def with_settings(settings)
+      saved_settings = Settings.to_hash.slice(*settings.keys)
+
+      Settings.merge!(settings)
 
       yield
+    ensure
+      Settings.merge!(saved_settings)
+    end
+
+    def with_user_account_deletion_delay(value, &block)
+      freeze_time
 
-      Settings.user_account_deletion_delay = default_value
+      with_settings(:user_account_deletion_delay => value, &block)
+    ensure
       unfreeze_time
     end
   end