mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
906aebceed
Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list of commits that could not be applied cleanly or are obviated with the abstract_controller refactor. They all need to be revisited to ensure that fixes made in 2.3 do not reappear in 3.0:2259ecf368
AR not available * This will be reimplemented with ActionORM or equivalent06182ea02e
implicitly rendering a js response should not use the default layout [#1844 state:resolved] * This will be handled generically893e9eb995
Improve view rendering performance in development mode and reinstate template recompiling in production [#1909 state:resolved] * We will need to reimplement rails-dev-boost on top of the refactor; the changes here are very implementation specific and cannot be cleanly applied. The following commits are implicated:199e750d46
3942cb406e
f8ea9f85d4
e3b166aab3
ae9f258e03
44423126c6
0cb020b4d6
workaround for picking layouts based on wrong view_paths [#1974 state:resolved] * The specifics of this commit no longer apply. Since it is a two-line commit, we will reimplement this change.8c5cc66a83
make action_controller/layouts pick templates from the current instance's view_paths instead of the class view_paths [#1974 state:resolved] * This does not apply at all. It should be trivial to apply the feature to the reimplemented ActionController::Base.87e8b16246
fix HTML fallback for explicit templates [#2052 state:resolved] * There were a number of patches related to this that simply compounded each other. Basically none of them apply cleanly, and the underlying issue needs to be revisited. After discussing the underlying problem with Koz, we will defer these fixes for further discussion.
238 lines
6.4 KiB
Ruby
238 lines
6.4 KiB
Ruby
require 'abstract_unit'
|
|
|
|
# The view_paths array must be set on Base and not LayoutTest so that LayoutTest's inherited
|
|
# method has access to the view_paths array when looking for a layout to automatically assign.
|
|
old_load_paths = ActionController::Base.view_paths
|
|
|
|
ActionView::Template::register_template_handler :mab,
|
|
lambda { |template| template.source.inspect }
|
|
|
|
ActionController::Base.view_paths = [ File.dirname(__FILE__) + '/../fixtures/layout_tests/' ]
|
|
|
|
class LayoutTest < ActionController::Base
|
|
def self.controller_path; 'views' end
|
|
self.view_paths = ActionController::Base.view_paths.dup
|
|
end
|
|
|
|
# Restore view_paths to previous value
|
|
ActionController::Base.view_paths = old_load_paths
|
|
|
|
class ProductController < LayoutTest
|
|
end
|
|
|
|
class ItemController < LayoutTest
|
|
end
|
|
|
|
class ThirdPartyTemplateLibraryController < LayoutTest
|
|
end
|
|
|
|
module ControllerNameSpace
|
|
end
|
|
|
|
class ControllerNameSpace::NestedController < LayoutTest
|
|
end
|
|
|
|
class MultipleExtensions < LayoutTest
|
|
end
|
|
|
|
class LayoutAutoDiscoveryTest < ActionController::TestCase
|
|
def setup
|
|
super
|
|
@request.host = "www.nextangle.com"
|
|
end
|
|
|
|
def test_application_layout_is_default_when_no_controller_match
|
|
@controller = ProductController.new
|
|
get :hello
|
|
assert_equal 'layout_test.rhtml hello.rhtml', @response.body
|
|
end
|
|
|
|
def test_controller_name_layout_name_match
|
|
@controller = ItemController.new
|
|
get :hello
|
|
assert_equal 'item.rhtml hello.rhtml', @response.body
|
|
end
|
|
|
|
def test_third_party_template_library_auto_discovers_layout
|
|
@controller = ThirdPartyTemplateLibraryController.new
|
|
get :hello
|
|
assert_equal 'layouts/third_party_template_library.mab', @controller.active_layout(true).to_s
|
|
assert_equal 'layouts/third_party_template_library', @response.layout
|
|
assert_response :success
|
|
assert_equal 'Mab', @response.body
|
|
end
|
|
|
|
def test_namespaced_controllers_auto_detect_layouts
|
|
@controller = ControllerNameSpace::NestedController.new
|
|
get :hello
|
|
assert_equal 'layouts/controller_name_space/nested', @controller.active_layout(true).to_s
|
|
assert_equal 'controller_name_space/nested.rhtml hello.rhtml', @response.body
|
|
end
|
|
|
|
def test_namespaced_controllers_auto_detect_layouts
|
|
@controller = MultipleExtensions.new
|
|
get :hello
|
|
assert_equal 'layouts/multiple_extensions.html.erb', @controller.active_layout(true).to_s
|
|
assert_equal 'multiple_extensions.html.erb hello.rhtml', @response.body.strip
|
|
end
|
|
end
|
|
|
|
class DefaultLayoutController < LayoutTest
|
|
end
|
|
|
|
class AbsolutePathLayoutController < LayoutTest
|
|
layout File.expand_path(File.expand_path(__FILE__) + '/../../fixtures/layout_tests/layouts/layout_test.rhtml')
|
|
end
|
|
|
|
class HasOwnLayoutController < LayoutTest
|
|
layout 'item'
|
|
end
|
|
|
|
class PrependsViewPathController < LayoutTest
|
|
def hello
|
|
prepend_view_path File.dirname(__FILE__) + '/../fixtures/layout_tests/alt/'
|
|
render :layout => 'alt'
|
|
end
|
|
end
|
|
|
|
class OnlyLayoutController < LayoutTest
|
|
layout 'item', :only => "hello"
|
|
end
|
|
|
|
class ExceptLayoutController < LayoutTest
|
|
layout 'item', :except => "goodbye"
|
|
end
|
|
|
|
class SetsLayoutInRenderController < LayoutTest
|
|
def hello
|
|
render :layout => 'third_party_template_library'
|
|
end
|
|
end
|
|
|
|
class RendersNoLayoutController < LayoutTest
|
|
def hello
|
|
render :layout => false
|
|
end
|
|
end
|
|
|
|
class LayoutSetInResponseTest < ActionController::TestCase
|
|
def test_layout_set_when_using_default_layout
|
|
@controller = DefaultLayoutController.new
|
|
get :hello
|
|
assert_equal 'layouts/layout_test', @response.layout
|
|
end
|
|
|
|
def test_layout_set_when_set_in_controller
|
|
@controller = HasOwnLayoutController.new
|
|
get :hello
|
|
assert_equal 'layouts/item', @response.layout
|
|
end
|
|
|
|
def test_layout_only_exception_when_included
|
|
@controller = OnlyLayoutController.new
|
|
get :hello
|
|
assert_equal 'layouts/item', @response.layout
|
|
end
|
|
|
|
def test_layout_only_exception_when_excepted
|
|
@controller = OnlyLayoutController.new
|
|
get :goodbye
|
|
assert_equal nil, @response.layout
|
|
end
|
|
|
|
def test_layout_except_exception_when_included
|
|
@controller = ExceptLayoutController.new
|
|
get :hello
|
|
assert_equal 'layouts/item', @response.layout
|
|
end
|
|
|
|
def test_layout_except_exception_when_excepted
|
|
@controller = ExceptLayoutController.new
|
|
get :goodbye
|
|
assert_equal nil, @response.layout
|
|
end
|
|
|
|
def test_layout_set_when_using_render
|
|
@controller = SetsLayoutInRenderController.new
|
|
get :hello
|
|
assert_equal 'layouts/third_party_template_library', @response.layout
|
|
end
|
|
|
|
def test_layout_is_not_set_when_none_rendered
|
|
@controller = RendersNoLayoutController.new
|
|
get :hello
|
|
assert_nil @response.layout
|
|
end
|
|
|
|
def test_exempt_from_layout_honored_by_render_template
|
|
ActionController::Base.exempt_from_layout :rhtml
|
|
@controller = RenderWithTemplateOptionController.new
|
|
|
|
get :hello
|
|
assert_equal "alt/hello.rhtml", @response.body.strip
|
|
|
|
ensure
|
|
ActionController::Base.exempt_from_layout.delete(/\.rhtml$/)
|
|
end
|
|
|
|
def test_layout_is_picked_from_the_controller_instances_view_path
|
|
pending do
|
|
@controller = PrependsViewPathController.new
|
|
get :hello
|
|
assert_equal 'layouts/alt', @response.layout
|
|
end
|
|
end
|
|
|
|
def test_absolute_pathed_layout
|
|
@controller = AbsolutePathLayoutController.new
|
|
get :hello
|
|
assert_equal "layout_test.rhtml hello.rhtml", @response.body.strip
|
|
end
|
|
end
|
|
|
|
class RenderWithTemplateOptionController < LayoutTest
|
|
def hello
|
|
render :template => 'alt/hello'
|
|
end
|
|
end
|
|
|
|
class SetsNonExistentLayoutFile < LayoutTest
|
|
layout "nofile.rhtml"
|
|
end
|
|
|
|
class LayoutExceptionRaised < ActionController::TestCase
|
|
def test_exception_raised_when_layout_file_not_found
|
|
@controller = SetsNonExistentLayoutFile.new
|
|
get :hello
|
|
assert_kind_of ActionView::MissingTemplate, @response.template.instance_eval { @exception }
|
|
end
|
|
end
|
|
|
|
class LayoutStatusIsRendered < LayoutTest
|
|
def hello
|
|
render :status => 401
|
|
end
|
|
end
|
|
|
|
class LayoutStatusIsRenderedTest < ActionController::TestCase
|
|
def test_layout_status_is_rendered
|
|
@controller = LayoutStatusIsRendered.new
|
|
get :hello
|
|
assert_response 401
|
|
end
|
|
end
|
|
|
|
unless RUBY_PLATFORM =~ /(:?mswin|mingw|bccwin)/
|
|
class LayoutSymlinkedTest < LayoutTest
|
|
layout "symlinked/symlinked_layout"
|
|
end
|
|
|
|
class LayoutSymlinkedIsRenderedTest < ActionController::TestCase
|
|
def test_symlinked_layout_is_rendered
|
|
@controller = LayoutSymlinkedTest.new
|
|
get :hello
|
|
assert_response 200
|
|
assert_equal "layouts/symlinked/symlinked_layout", @response.layout
|
|
end
|
|
end
|
|
end
|