Use with_settings for temporary changes to settings

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 5bf8a5239ecfe2c6625eb969b98c625cf5a81484..5fe1ada472605d04d25717e032a87a02837e363d 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -384,14 +384,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