diff options
| author | José Valim <jose.valim@gmail.com> | 2012-05-10 01:33:47 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-05-10 01:33:47 -0700 |
| commit | dd9ea8d4dededdad2c6de23260a24b2835fb2fbd (patch) | |
| tree | 39243976411d465ee1d088b01392506e17a81dea /activesupport/lib | |
| parent | ffa1c72d1d238b4c1b73aeb6a387d0f331a97f2c (diff) | |
| parent | 039917b4086c3567f298716114301b161bb5b1fe (diff) | |
| download | rails-dd9ea8d4dededdad2c6de23260a24b2835fb2fbd.tar.gz rails-dd9ea8d4dededdad2c6de23260a24b2835fb2fbd.tar.bz2 rails-dd9ea8d4dededdad2c6de23260a24b2835fb2fbd.zip | |
Merge pull request #6244 from frodsan/fix_build_remove_key
Remove key argument from run_callbacks to fix build
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/testing/performance.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/testing/performance.rb b/activesupport/lib/active_support/testing/performance.rb index 244ee1a224..f6bf0318f7 100644 --- a/activesupport/lib/active_support/testing/performance.rb +++ b/activesupport/lib/active_support/testing/performance.rb @@ -61,7 +61,7 @@ module ActiveSupport ensure begin teardown - run_callbacks :teardown, :enumerator => :reverse_each + run_callbacks :teardown rescue Exception => e result = @runner.puke(self.class, method_name, e) end |