From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 27 Mar 2011 15:41:05 +0000 (+0000)
Subject: Restore settings even if a test failure occurs.
X-Git-Tag: 1.2.0~617
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3ef5daaf35185cf20a79ca38334abe0074f58549;p=redmine.git

Restore settings even if a test failure occurs.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5227 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/test/test_helper.rb b/test/test_helper.rb
index ea47670c0..e8474de15 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -87,6 +87,7 @@ class ActiveSupport::TestCase
     saved_settings = options.keys.inject({}) {|h, k| h[k] = Setting[k].dup; h}
     options.each {|k, v| Setting[k] = v}
     yield
+  ensure
     saved_settings.each {|k, v| Setting[k] = v}
   end