Permalink
Browse files

Whoops, I guess we broke layouts ;)

  • Loading branch information...
1 parent 19c3495 commit 3c15cba17519e7a4acc3958662f8f3693837c179 Yehuda Katz + Carl Lerche committed Jun 16, 2009
@@ -9,6 +9,11 @@ module Layouts
end
module ClassMethods
+ def inherited(klass)
+ super
+ klass._write_layout_method
+ end
+
# Specify the layout to use for this class.
#
# If the specified layout is a:
@@ -78,6 +83,7 @@ def _layout(details)
end
ruby_eval
end
+ self.class_eval { private :_layout }
end
end
@@ -71,12 +71,6 @@ def self.subclasses
@subclasses ||= []
end
- def self.app_loaded!
- @subclasses.each do |subclass|
- subclass.constantize._write_layout_method
- end
- end
-
def _normalize_options(action = nil, options = {}, &blk)
if action.is_a?(Hash)
options, action = action, nil
@@ -136,11 +136,6 @@ class TestPrefixedViews < ActiveSupport::TestCase
class WithLayouts < PrefixedViews
include Layouts
- def self.inherited(klass)
- klass._write_layout_method
- super
- end
-
private
def self.layout(formats)
begin
@@ -141,15 +141,6 @@ def index
end
end
- # TODO Move to bootloader
- AbstractController::Base.descendants.each do |klass|
- klass = klass.constantize
- next unless klass < AbstractController::Layouts
- klass.class_eval do
- _write_layout_method
- end
- end
-
class TestBase < ActiveSupport::TestCase
test "when no layout is specified, and no default is available, render without a layout" do
result = Blank.new.process(:index)
@@ -134,6 +134,4 @@ class RenderTextTest < SimpleRouteCase
assert_status 200
end
end
-end
-
-ActionController::Base.app_loaded!
+end
@@ -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

0 comments on commit 3c15cba

Please sign in to comment.