aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-11-08 21:30:34 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2009-11-08 21:30:34 -0800
commitc44fb4ced5cbe61adb12f3431db05afa492bd176 (patch)
tree185e99240bcbd46604e29820c535b993ef195f31 /activesupport
parentc10f4ae01d91d1afc90b21d4bba51e59ae9a0625 (diff)
downloadrails-c44fb4ced5cbe61adb12f3431db05afa492bd176.tar.gz
rails-c44fb4ced5cbe61adb12f3431db05afa492bd176.tar.bz2
rails-c44fb4ced5cbe61adb12f3431db05afa492bd176.zip
Ruby 1.9: use method_name to work around miniunit API changes
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/testing/setup_and_teardown.rb4
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