diff options
| author | Yehuda Katz <wycats@Yehuda-Katz.local> | 2009-11-09 10:57:20 -0800 |
|---|---|---|
| committer | Yehuda Katz <wycats@Yehuda-Katz.local> | 2009-11-09 10:57:20 -0800 |
| commit | 790c062280c0d23c2033e4983c13d402c0424f2a (patch) | |
| tree | 7b652b420411779072c2371a42e84c83525f63b1 /activesupport/lib/active_support/testing | |
| parent | 51fe6d05e73a4e0f8481f4e441f4ca886d65a69c (diff) | |
| parent | 303991288633effea5a1d1774dbd861951303fe5 (diff) | |
| download | rails-790c062280c0d23c2033e4983c13d402c0424f2a.tar.gz rails-790c062280c0d23c2033e4983c13d402c0424f2a.tar.bz2 rails-790c062280c0d23c2033e4983c13d402c0424f2a.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'activesupport/lib/active_support/testing')
| -rw-r--r-- | activesupport/lib/active_support/testing/setup_and_teardown.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/testing/setup_and_teardown.rb b/activesupport/lib/active_support/testing/setup_and_teardown.rb index 7952eb50c3..0e998d2dbe 100644 --- a/activesupport/lib/active_support/testing/setup_and_teardown.rb +++ b/activesupport/lib/active_support/testing/setup_and_teardown.rb @@ -21,12 +21,12 @@ module ActiveSupport run_callbacks :setup result = super rescue Exception => e - result = runner.puke(self.class, self.name, e) + result = runner.puke(self.class, method_name, e) ensure begin run_callbacks :teardown, :enumerator => :reverse_each rescue Exception => e - result = runner.puke(self.class, self.name, e) + result = runner.puke(self.class, method_name, e) end end result |