X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/31659bedbe22001bc304e5c7c92c7b67b87d74e2..bd1f568c0a91d8d58b05912fdae1a6912edd3e62:/test/test_helper.rb diff --git a/test/test_helper.rb b/test/test_helper.rb index 5bf8a5239..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) @@ -384,14 +385,11 @@ module ActiveSupport Settings.merge!(saved_settings) end - def with_user_account_deletion_delay(value) + def with_user_account_deletion_delay(value, &block) freeze_time - default_value = Settings.user_account_deletion_delay - Settings.user_account_deletion_delay = value - yield - - Settings.user_account_deletion_delay = default_value + with_settings(:user_account_deletion_delay => value, &block) + ensure unfreeze_time end end