diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-05-04 19:23:34 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-05-04 19:23:34 -0300 |
| commit | d3042ef80c4406c90ff1e120059a99784d8ae79f (patch) | |
| tree | a779b4fced3fd546d7c7c855fee41f3d996afba0 /actionpack/test/controller/base_test.rb | |
| parent | d522b7ccf61a71b4c66ddf39368513d1fd9cd577 (diff) | |
| parent | eb201e64c0b68aee6d0715d44cf48178204c4133 (diff) | |
| download | rails-d3042ef80c4406c90ff1e120059a99784d8ae79f.tar.gz rails-d3042ef80c4406c90ff1e120059a99784d8ae79f.tar.bz2 rails-d3042ef80c4406c90ff1e120059a99784d8ae79f.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/test/controller/base_test.rb')
| -rw-r--r-- | actionpack/test/controller/base_test.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb index f4517d06c4..0c54d61426 100644 --- a/actionpack/test/controller/base_test.rb +++ b/actionpack/test/controller/base_test.rb @@ -27,6 +27,7 @@ class EmptyController < ActionController::Base end class NonEmptyController < ActionController::Base def public_action + render :nothing => true end hide_action :hidden_action @@ -51,6 +52,7 @@ end class DefaultUrlOptionsController < ActionController::Base def default_url_options_action + render :nothing => true end def default_url_options(options = nil) @@ -151,11 +153,8 @@ class PerformActionTest < ActionController::TestCase def test_get_on_hidden_should_fail use_controller NonEmptyController - get :hidden_action - assert_response 404 - - get :another_hidden_action - assert_response 404 + assert_raise(ActionController::UnknownAction) { get :hidden_action } + assert_raise(ActionController::UnknownAction) { get :another_hidden_action } end def test_namespaced_action_should_log_module_name |