aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/testing/isolation.rb
diff options
context:
space:
mode:
authorwycats <wycats@gmail.com>2010-03-17 00:15:55 -0700
committerwycats <wycats@gmail.com>2010-03-17 00:20:09 -0700
commita5587efc1903fd27d4b179753aa6e139445ad18c (patch)
tree7642d070d3f876e4c11b7aea3cded9ec2ffd2d79 /activesupport/lib/active_support/testing/isolation.rb
parentcd9ffd11e13ef6e62eba2cbd5c3760ff04132820 (diff)
downloadrails-a5587efc1903fd27d4b179753aa6e139445ad18c.tar.gz
rails-a5587efc1903fd27d4b179753aa6e139445ad18c.tar.bz2
rails-a5587efc1903fd27d4b179753aa6e139445ad18c.zip
Remove some 1.9 warnings (resulting in some fixed bugs). Remaining AM warnings are in dependencies.
Diffstat (limited to 'activesupport/lib/active_support/testing/isolation.rb')
-rw-r--r--activesupport/lib/active_support/testing/isolation.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/testing/isolation.rb b/activesupport/lib/active_support/testing/isolation.rb
index 453f4fcc0f..9507dbf473 100644
--- a/activesupport/lib/active_support/testing/isolation.rb
+++ b/activesupport/lib/active_support/testing/isolation.rb
@@ -78,8 +78,8 @@ module ActiveSupport
@@ran_class_setup = true
end
- serialized = run_in_isolation do |runner|
- super(runner)
+ serialized = run_in_isolation do |isolated_runner|
+ super(isolated_runner)
end
retval, proxy = Marshal.load(serialized)