spec/fixtures/views/a/render_non_existent_partial.html.erb @@ -9,6 +9,8 @@ AController < TestController; inherit_views (an instance) - GET :in_abc should render a/in_abc - GET :in_a should render a/in_a - GET :in_ab should render a/in_ab +- GET :render_non_existent_partial should raise ActionView::TemplateError +- GET :render_non_existent_template should raise ActionView::MissingTemplate BController < TestController; inherit_views 'a' (the class) - should be inherit views @@ -52,6 +54,6 @@ DController < AController; inherit_views 'other' (an instance) NormalController - GET :partial_from_c should render normal/partial_from_c, then c/_partial_in_bc -Finished in 0.348816 seconds +Finished in 0.242443 seconds -35 examples, 0 failures +37 examples, 0 failures SPECDOC @@ -44,10 +44,6 @@ module Ardes#:nodoc: # end # module InheritViews - - # raised when an inherited file cannot be found, and one is required (e.g. in render_parent) - class InheritedFileNotFound < RuntimeError; end - # extension for ActionController::Base which enables inherit_views, this module is extended into # ActionController::Base module ActionController @@ -103,10 +99,12 @@ module Ardes#:nodoc: def _pick_template(template_path) _orig_pick_template(template_path) - rescue ::ActionView::MissingTemplate + rescue ::ActionView::MissingTemplate => e if controller.respond_to?(:inherit_views?) && controller.inherit_views? - _pick_template_from_inherit_view_paths(template_path, controller.inherit_view_paths) + found = _pick_template_from_inherit_view_paths(template_path, controller.inherit_view_paths) + return found if found end + raise e end def _pick_template_from_inherit_view_paths(template_path, inherit_view_paths) @@ -124,6 +122,7 @@ module Ardes#:nodoc: return inherited_template if inherited_template end end + nil end memoize :_pick_template_from_inherit_view_paths end lib/ardes/inherit_views.rb @@ -6,6 +6,10 @@ end # its subclasses will inherit its views class AController < InheritViewsTestController inherit_views + + def render_non_existent_template + render :action => 'non_exitsent' + end end # :b controller is a normal controller with inherit_views 'a' @@ -23,6 +27,6 @@ class DController < AController inherit_views 'other' end -# used to test that inherit_views doesn't muck anything else up +# used to test normal rails behaviour class NormalController < InheritViewsTestController end spec/app.rb @@ -33,5 +33,13 @@ describe AController, " < TestController; inherit_views" do get :in_ab response.body.should == 'a:in_ab' end + + it "GET :render_non_existent_partial should raise ActionView::TemplateError" do + lambda { get :render_non_existent_partial }.should raise_error(ActionView::TemplateError) + end + + it "GET :render_non_existent_template should raise ActionView::MissingTemplate" do + lambda { get :render_non_existent_template }.should raise_error(ActionView::MissingTemplate) + end end end \ No newline at end of file spec/controllers/a_controller_spec.rb e2d2e7e84ceb8da6d69bbea453f083c3d1dd4de0 Ian White ian.w.white@gmail.com http://github.com/ianwhite/inherit_views/commit/4f0e15b1099cc4e6b0729c7c5059fafceb58a1c7 4f0e15b1099cc4e6b0729c7c5059fafceb58a1c7 2008-09-21T01:06:53-07:00 2008-09-21T01:06:53-07:00 Make sure that ActionView::MissingTemplate is still raised when an inherited template can't be found 4f7a7aadd3527ca2a7094ea9320dddbf07dd0754 Ian White ian.w.white@gmail.com