diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-01-07 13:23:10 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-01-07 14:49:05 -0800 |
commit | 35fa00731329120fa1d0c2a9d66af6813203195a (patch) | |
tree | 32457ad68703af36d8fa2ee74bb12232428ebbf2 /actionpack/test/controller/base_test.rb | |
parent | 0f9e65b71f9af30dac17689e81f4353e9fcac5b6 (diff) | |
download | rails-35fa00731329120fa1d0c2a9d66af6813203195a.tar.gz rails-35fa00731329120fa1d0c2a9d66af6813203195a.tar.bz2 rails-35fa00731329120fa1d0c2a9d66af6813203195a.zip |
Include process methods in ActionController::TestCase only. No need to alias_method_chain :process either.
Diffstat (limited to 'actionpack/test/controller/base_test.rb')
-rw-r--r-- | actionpack/test/controller/base_test.rb | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb index 18d185b264..9523189f41 100644 --- a/actionpack/test/controller/base_test.rb +++ b/actionpack/test/controller/base_test.rb @@ -129,6 +129,8 @@ class PerformActionTest < ActionController::TestCase @response = ActionController::TestResponse.new @request.host = "www.nextangle.com" + + rescue_action_in_public! end def test_get_on_priv_should_show_selector @@ -164,14 +166,12 @@ class PerformActionTest < ActionController::TestCase end end -class DefaultUrlOptionsTest < Test::Unit::TestCase - def setup - @controller = DefaultUrlOptionsController.new - - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new +class DefaultUrlOptionsTest < ActionController::TestCase + tests DefaultUrlOptionsController + def setup @request.host = 'www.example.com' + rescue_action_in_public! end def test_default_url_options_are_used_if_set @@ -189,14 +189,12 @@ class DefaultUrlOptionsTest < Test::Unit::TestCase end end -class EmptyUrlOptionsTest < Test::Unit::TestCase - def setup - @controller = NonEmptyController.new - - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new +class EmptyUrlOptionsTest < ActionController::TestCase + tests NonEmptyController + def setup @request.host = 'www.example.com' + rescue_action_in_public! end def test_ensure_url_for_works_as_expected_when_called_with_no_options_if_default_url_options_is_not_set |