diff options
| author | wycats <wycats@gmail.com> | 2010-03-26 15:10:24 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-03-26 15:10:24 -0700 |
| commit | 197904341f2b2f21d69c653cede3aec124e86720 (patch) | |
| tree | 83f1234e238016126860a929594db22e1862d783 /activesupport/lib/active_support/testing/isolation.rb | |
| parent | 76d2c455c0607b4cd5f238cadef8f933a18567fb (diff) | |
| parent | b3a0aed028835ce4551c4a76742744a40a71b0be (diff) | |
| download | rails-197904341f2b2f21d69c653cede3aec124e86720.tar.gz rails-197904341f2b2f21d69c653cede3aec124e86720.tar.bz2 rails-197904341f2b2f21d69c653cede3aec124e86720.zip | |
Merge branch 'master' into docrails
Diffstat (limited to 'activesupport/lib/active_support/testing/isolation.rb')
| -rw-r--r-- | activesupport/lib/active_support/testing/isolation.rb | 4 |
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) |