aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/new_base
diff options
context:
space:
mode:
authorYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-06-15 17:32:10 -0700
committerYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-06-15 17:32:10 -0700
commit3c15cba17519e7a4acc3958662f8f3693837c179 (patch)
tree9cf370a4ac9da9eee54130633b297209fd9d02d1 /actionpack/test/new_base
parent19c3495a671c364e0dc76c276efbcd9dc6914c74 (diff)
downloadrails-3c15cba17519e7a4acc3958662f8f3693837c179.tar.gz
rails-3c15cba17519e7a4acc3958662f8f3693837c179.tar.bz2
rails-3c15cba17519e7a4acc3958662f8f3693837c179.zip
Whoops, I guess we broke layouts ;)
Diffstat (limited to 'actionpack/test/new_base')
-rw-r--r--actionpack/test/new_base/render_text_test.rb4
-rw-r--r--actionpack/test/new_base/test_helper.rb9
2 files changed, 1 insertions, 12 deletions
diff --git a/actionpack/test/new_base/render_text_test.rb b/actionpack/test/new_base/render_text_test.rb
index ffc149283b..4a90eaac40 100644
--- a/actionpack/test/new_base/render_text_test.rb
+++ b/actionpack/test/new_base/render_text_test.rb
@@ -134,6 +134,4 @@ module RenderText
assert_status 200
end
end
-end
-
-ActionController::Base.app_loaded!
+end \ No newline at end of file
diff --git a/actionpack/test/new_base/test_helper.rb b/actionpack/test/new_base/test_helper.rb
index 722dddcfc2..9271b2dd59 100644
--- a/actionpack/test/new_base/test_helper.rb
+++ b/actionpack/test/new_base/test_helper.rb
@@ -41,15 +41,6 @@ class Rack::TestCase < ActionController::IntegrationTest
end
ActionController::Routing.use_controllers!(controllers)
-
- # Move into a bootloader
- ActionController::Base.subclasses.each do |klass|
- klass = klass.constantize
- next unless klass < AbstractController::Layouts
- klass.class_eval do
- _write_layout_method
- end
- end
end
def app