diff options
author | José Valim <jose.valim@gmail.com> | 2012-01-17 12:00:05 -0800 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2012-01-17 12:00:05 -0800 |
commit | ba154bd76fb481d9faca123e988924bd864c0318 (patch) | |
tree | 89cb9542a0717e52477e6c0ae08fd703ce80dd6d /actionpack/test/controller/render_test.rb | |
parent | 422958f17cbe1b6009313b7acd01cc11aacec3d7 (diff) | |
parent | 96a817fb2c5ca32c69469a9d2dc13630d8fa5e8a (diff) | |
download | rails-ba154bd76fb481d9faca123e988924bd864c0318.tar.gz rails-ba154bd76fb481d9faca123e988924bd864c0318.tar.bz2 rails-ba154bd76fb481d9faca123e988924bd864c0318.zip |
Merge pull request #4497 from carlosantoniodasilva/action-controller-refactor
Action controller refactor - remove Compatibility module
Diffstat (limited to 'actionpack/test/controller/render_test.rb')
-rw-r--r-- | actionpack/test/controller/render_test.rb | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb index ec26315dc7..8c2d622304 100644 --- a/actionpack/test/controller/render_test.rb +++ b/actionpack/test/controller/render_test.rb @@ -54,7 +54,7 @@ class TestController < ActionController::Base def conditional_hello_with_record record = Struct.new(:updated_at, :cache_key).new(Time.now.utc.beginning_of_day, "foo/123") - + if stale?(record) render :action => 'hello_world' end @@ -649,10 +649,6 @@ class TestController < ActionController::Base render :action => "calling_partial_with_layout", :layout => "layouts/partial_with_layout" end - def rescue_action(e) - raise - end - before_filter :only => :render_with_filters do request.format = :xml end @@ -891,12 +887,12 @@ class RenderTest < ActionController::TestCase # :ported: def test_attempt_to_access_object_method - assert_raise(ActionController::UnknownAction, "No action responded to [clone]") { get :clone } + assert_raise(AbstractController::ActionNotFound, "No action responded to [clone]") { get :clone } end # :ported: def test_private_methods - assert_raise(ActionController::UnknownAction, "No action responded to [determine_layout]") { get :determine_layout } + assert_raise(AbstractController::ActionNotFound, "No action responded to [determine_layout]") { get :determine_layout } end # :ported: @@ -1096,15 +1092,15 @@ class RenderTest < ActionController::TestCase # :ported: def test_double_render - assert_raise(ActionController::DoubleRenderError) { get :double_render } + assert_raise(AbstractController::DoubleRenderError) { get :double_render } end def test_double_redirect - assert_raise(ActionController::DoubleRenderError) { get :double_redirect } + assert_raise(AbstractController::DoubleRenderError) { get :double_redirect } end def test_render_and_redirect - assert_raise(ActionController::DoubleRenderError) { get :render_and_redirect } + assert_raise(AbstractController::DoubleRenderError) { get :render_and_redirect } end # specify the one exception to double render rule - render_to_string followed by render |