aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-01-18 11:04:41 -0800
committerJosé Valim <jose.valim@gmail.com>2012-01-18 11:04:41 -0800
commit423b2626d85f75bb5fec03909ff8963bded7c7d5 (patch)
tree8844a0dfa875e2da9dab2ae71bdc00cd72cc92eb /activesupport
parent660cc4064490c2ae05521b2e14d3adead4bac520 (diff)
parente89a7f5ceeadc7b7d654c82b730d6340176e5a99 (diff)
downloadrails-423b2626d85f75bb5fec03909ff8963bded7c7d5.tar.gz
rails-423b2626d85f75bb5fec03909ff8963bded7c7d5.tar.bz2
rails-423b2626d85f75bb5fec03909ff8963bded7c7d5.zip
Merge pull request #4527 from rafaelfranca/av-logger
Remove delegation to ActionController::Base
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/testing/isolation.rb10
1 files changed, 0 insertions, 10 deletions
diff --git a/activesupport/lib/active_support/testing/isolation.rb b/activesupport/lib/active_support/testing/isolation.rb
index c896b955fb..5d5de4798d 100644
--- a/activesupport/lib/active_support/testing/isolation.rb
+++ b/activesupport/lib/active_support/testing/isolation.rb
@@ -117,13 +117,3 @@ module ActiveSupport
end
end
end
-
-# Only in subprocess for windows / jruby.
-if ENV['ISOLATION_TEST']
- require "test/unit/collector/objectspace"
- class Test::Unit::Collector::ObjectSpace
- def include?(test)
- super && test.method_name == ENV['ISOLATION_TEST']
- end
- end
-end