RubyGems - actionpack - Versions diffs - 1.12.5 → 1.13.0 - Mend

actionpack 1.12.5 → 1.13.0

Potentially problematic release.

This version of actionpack might be problematic. Click here for more details.

Files changed (179) hide show

data/CHANGELOG +517 -15
data/MIT-LICENSE +1 -1
data/README +18 -20
data/Rakefile +7 -4
data/examples/address_book_controller.rb +3 -3
data/examples/blog_controller.cgi +3 -3
data/examples/debate_controller.cgi +5 -5
data/lib/action_controller.rb +2 -2
data/lib/action_controller/assertions.rb +73 -311
data/lib/action_controller/{deprecated_assertions.rb → assertions/deprecated_assertions.rb} +32 -8
data/lib/action_controller/assertions/dom_assertions.rb +25 -0
data/lib/action_controller/assertions/model_assertions.rb +12 -0
data/lib/action_controller/assertions/response_assertions.rb +140 -0
data/lib/action_controller/assertions/routing_assertions.rb +82 -0
data/lib/action_controller/assertions/selector_assertions.rb +571 -0
data/lib/action_controller/assertions/tag_assertions.rb +117 -0
data/lib/action_controller/base.rb +334 -163
data/lib/action_controller/benchmarking.rb +3 -6
data/lib/action_controller/caching.rb +83 -22
data/lib/action_controller/cgi_ext/cgi_ext.rb +0 -7
data/lib/action_controller/cgi_ext/cgi_methods.rb +167 -173
data/lib/action_controller/cgi_ext/raw_post_data_fix.rb +43 -22
data/lib/action_controller/cgi_process.rb +50 -27
data/lib/action_controller/components.rb +21 -25
data/lib/action_controller/cookies.rb +10 -9
data/lib/action_controller/{dependencies.rb → deprecated_dependencies.rb} +9 -27
data/lib/action_controller/filters.rb +448 -225
data/lib/action_controller/flash.rb +24 -20
data/lib/action_controller/helpers.rb +2 -5
data/lib/action_controller/integration.rb +40 -16
data/lib/action_controller/layout.rb +11 -8
data/lib/action_controller/macros/auto_complete.rb +3 -2
data/lib/action_controller/macros/in_place_editing.rb +3 -2
data/lib/action_controller/mime_responds.rb +41 -29
data/lib/action_controller/mime_type.rb +68 -10
data/lib/action_controller/pagination.rb +4 -3
data/lib/action_controller/request.rb +22 -14
data/lib/action_controller/rescue.rb +25 -22
data/lib/action_controller/resources.rb +302 -0
data/lib/action_controller/response.rb +20 -2
data/lib/action_controller/response.rb.rej +17 -0
data/lib/action_controller/routing.rb +1165 -567
data/lib/action_controller/scaffolding.rb +30 -31
data/lib/action_controller/session/active_record_store.rb +2 -0
data/lib/action_controller/session/drb_store.rb +4 -0
data/lib/action_controller/session/mem_cache_store.rb +4 -0
data/lib/action_controller/session_management.rb +6 -9
data/lib/action_controller/status_codes.rb +89 -0
data/lib/action_controller/streaming.rb +6 -15
data/lib/action_controller/templates/rescues/_request_and_response.rhtml +5 -5
data/lib/action_controller/templates/rescues/diagnostics.rhtml +2 -2
data/lib/action_controller/templates/rescues/routing_error.rhtml +4 -4
data/lib/action_controller/templates/rescues/template_error.rhtml +1 -1
data/lib/action_controller/templates/scaffolds/list.rhtml +1 -1
data/lib/action_controller/test_process.rb +52 -30
data/lib/action_controller/url_rewriter.rb +63 -29
data/lib/action_controller/vendor/html-scanner/html/document.rb +1 -0
data/lib/action_controller/vendor/html-scanner/html/node.rb +3 -4
data/lib/action_controller/vendor/html-scanner/html/selector.rb +822 -0
data/lib/action_controller/verification.rb +22 -11
data/lib/action_pack.rb +1 -1
data/lib/action_pack/version.rb +2 -2
data/lib/action_view.rb +1 -1
data/lib/action_view/base.rb +46 -43
data/lib/action_view/compiled_templates.rb +1 -1
data/lib/action_view/helpers/active_record_helper.rb +54 -17
data/lib/action_view/helpers/asset_tag_helper.rb +97 -46
data/lib/action_view/helpers/capture_helper.rb +1 -1
data/lib/action_view/helpers/date_helper.rb +258 -136
data/lib/action_view/helpers/debug_helper.rb +1 -1
data/lib/action_view/helpers/deprecated_helper.rb +34 -0
data/lib/action_view/helpers/form_helper.rb +75 -35
data/lib/action_view/helpers/form_options_helper.rb +7 -5
data/lib/action_view/helpers/form_tag_helper.rb +44 -6
data/lib/action_view/helpers/java_script_macros_helper.rb +59 -46
data/lib/action_view/helpers/javascript_helper.rb +71 -10
data/lib/action_view/helpers/javascripts/controls.js +41 -23
data/lib/action_view/helpers/javascripts/dragdrop.js +105 -76
data/lib/action_view/helpers/javascripts/effects.js +293 -163
data/lib/action_view/helpers/javascripts/prototype.js +897 -389
data/lib/action_view/helpers/javascripts/prototype.js.rej +561 -0
data/lib/action_view/helpers/number_helper.rb +111 -65
data/lib/action_view/helpers/prototype_helper.rb +84 -109
data/lib/action_view/helpers/scriptaculous_helper.rb +5 -0
data/lib/action_view/helpers/tag_helper.rb +69 -16
data/lib/action_view/helpers/text_helper.rb +149 -112
data/lib/action_view/helpers/url_helper.rb +200 -107
data/lib/action_view/template_error.rb +66 -42
data/test/abstract_unit.rb +4 -2
data/test/active_record_unit.rb +84 -56
data/test/activerecord/active_record_assertions_test.rb +26 -18
data/test/activerecord/active_record_store_test.rb +4 -36
data/test/activerecord/pagination_test.rb +1 -6
data/test/controller/action_pack_assertions_test.rb +230 -113
data/test/controller/addresses_render_test.rb +2 -6
data/test/controller/assert_select_test.rb +576 -0
data/test/controller/base_test.rb +73 -3
data/test/controller/caching_test.rb +228 -0
data/test/controller/capture_test.rb +12 -10
data/test/controller/cgi_test.rb +89 -12
data/test/controller/components_test.rb +24 -2
data/test/controller/content_type_test.rb +139 -0
data/test/controller/controller_fixtures/app/controllers/admin/user_controller.rb +0 -0
data/test/controller/controller_fixtures/app/controllers/user_controller.rb +0 -0
data/test/controller/controller_fixtures/vendor/plugins/bad_plugin/lib/plugin_controller.rb +0 -0
data/test/controller/cookie_test.rb +33 -25
data/test/controller/deprecated_instance_variables_test.rb +48 -0
data/test/controller/deprecation/deprecated_base_methods_test.rb +60 -0
data/test/controller/fake_controllers.rb +0 -1
data/test/controller/filters_test.rb +301 -16
data/test/controller/flash_test.rb +19 -2
data/test/controller/helper_test.rb +2 -2
data/test/controller/integration_test.rb +154 -0
data/test/controller/layout_test.rb +115 -1
data/test/controller/mime_responds_test.rb +94 -0
data/test/controller/mime_type_test.rb +9 -0
data/test/controller/new_render_test.rb +161 -11
data/test/controller/raw_post_test.rb +52 -15
data/test/controller/redirect_test.rb +27 -14
data/test/controller/render_test.rb +76 -29
data/test/controller/request_test.rb +55 -4
data/test/controller/resources_test.rb +274 -0
data/test/controller/routing_test.rb +1533 -824
data/test/controller/selector_test.rb +628 -0
data/test/controller/send_file_test.rb +9 -1
data/test/controller/session_management_test.rb +51 -0
data/test/controller/test_test.rb +113 -29
data/test/controller/url_rewriter_test.rb +86 -17
data/test/controller/verification_test.rb +19 -17
data/test/controller/webservice_test.rb +0 -7
data/test/fixtures/content_type/render_default_content_types_for_respond_to.rhtml +1 -0
data/test/fixtures/content_type/render_default_for_rhtml.rhtml +1 -0
data/test/fixtures/content_type/render_default_for_rjs.rjs +1 -0
data/test/fixtures/content_type/render_default_for_rxml.rxml +1 -0
data/test/fixtures/deprecated_instance_variables/_cookies_ivar.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_cookies_method.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_flash_ivar.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_flash_method.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_headers_ivar.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_headers_method.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_params_ivar.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_params_method.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_request_ivar.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_request_method.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_response_ivar.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_response_method.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_session_ivar.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_session_method.rhtml +1 -0
data/test/fixtures/multipart/binary_file +0 -0
data/test/fixtures/public/javascripts/application.js +1 -0
data/test/fixtures/test/_hello.rxml +1 -0
data/test/fixtures/test/hello_world_container.rxml +3 -0
data/test/fixtures/topic.rb +2 -2
data/test/template/active_record_helper_test.rb +83 -12
data/test/template/asset_tag_helper_test.rb +75 -95
data/test/template/compiled_templates_test.rb +1 -0
data/test/template/date_helper_test.rb +873 -181
data/test/template/deprecated_helper_test.rb +36 -0
data/test/template/deprecated_instance_variables_test.rb +43 -0
data/test/template/form_helper_test.rb +77 -1
data/test/template/form_options_helper_test.rb +4 -0
data/test/template/form_tag_helper_test.rb +66 -2
data/test/template/java_script_macros_helper_test.rb +4 -1
data/test/template/javascript_helper_test.rb +29 -0
data/test/template/number_helper_test.rb +63 -27
data/test/template/prototype_helper_test.rb +77 -34
data/test/template/tag_helper_test.rb +34 -6
data/test/template/text_helper_test.rb +69 -34
data/test/template/url_helper_test.rb +168 -16
data/test/testing_sandbox.rb +7 -22
metadata +66 -20
data/filler.txt +0 -50
data/lib/action_controller/code_generation.rb +0 -235
data/lib/action_controller/vendor/xml_simple.rb +0 -1019
data/test/controller/caching_filestore.rb +0 -74
data/test/fixtures/application_root/app/controllers/a_class_that_contains_a_controller/poorly_placed_controller.rb +0 -7
data/test/fixtures/application_root/app/controllers/module_that_holds_controllers/nested_controller.rb +0 -3
data/test/fixtures/application_root/app/models/a_class_that_contains_a_controller.rb +0 -7
data/test/fixtures/dont_load.rb +0 -3

data/test/controller/new_render_test.rb CHANGED

@@ -161,6 +161,33 @@ class NewRenderTestController < ActionController::Base
     render :text =>  "How's there? #{render_to_string("test/list")}"
   end
+  def render_to_string_with_assigns
+    @before = "i'm before the render"
+    render_to_string :text => "foo"
+    @after = "i'm after the render"
+    render :action => "test/hello_world"
+  end
+ def render_to_string_with_partial
+    @partial_only = render_to_string :partial => "partial_only"
+    @partial_with_locals = render_to_string :partial => "customer", :locals => { :customer => Customer.new("david") }
+    render :action => "test/hello_world"
+  end
+  def render_to_string_with_exception
+    render_to_string :file => "exception that will not be caught - this will certainly not work", :use_full_path => true
+  end
+  def render_to_string_with_caught_exception
+    @before = "i'm before the render"
+    begin
+      render_to_string :file => "exception that will be caught- hope my future instance vars still work!", :use_full_path => true
+    rescue
+    end
+    @after = "i'm after the render"
+    render :action => "test/hello_world"
+  end
   def accessing_params_in_template
     render :inline =>  "Hello: <%= params[:name] %>"
   end
@@ -187,6 +214,11 @@ class NewRenderTestController < ActionController::Base
     render :text => "hello"
     redirect_to :action => "double_render"
   end
+  def render_to_string_and_render
+    @stuff = render_to_string :text => "here is some cached stuff"
+    render :text => "Hi web users! #{@stuff}"
+  end
   def rendering_with_conflicting_local_vars
     @name = "David"
@@ -202,6 +234,30 @@ class NewRenderTestController < ActionController::Base
     render :template => "test/hello_world.rxml"
   end
+  def head_with_location_header
+    head :location => "/foo"
+  end
+  def head_with_symbolic_status
+    head :status => params[:status].intern
+  end
+  def head_with_integer_status
+    head :status => params[:status].to_i
+  end
+  def head_with_string_status
+    head :status => params[:status]
+  end
+  def head_with_custom_header
+    head :x_custom_header => "something"
+  end
+  def head_with_status_code_first
+    head :forbidden, :x_custom_header => "something"
+  end
   helper NewRenderTestHelper
   helper do
     def rjs_helper_method(value)
@@ -263,6 +319,11 @@ class NewRenderTestController < ActionController::Base
     render :action => "content_for", :layout => "yield"
   end
+  def render_content_type_from_body
+    response.content_type = Mime::RSS
+    render :text => "hello world!"
+  end
   def rescue_action(e) raise end
   private
@@ -393,18 +454,26 @@ class NewRenderTest < Test::Unit::TestCase
     ActionController::Base.protected_variables_cache = nil
     get :hello_world
-    assert_nil(assigns["request"])
+    assert !assigns.include?('request'), 'request should not be in assigns'
     ActionController::Base.view_controller_internals = true
     ActionController::Base.protected_variables_cache = nil
     get :hello_world
-    assert_kind_of ActionController::AbstractRequest, assigns["request"]
+    assert assigns.include?('request'), 'request should be in assigns'
+    assert_deprecated 'request' do
+      assert_kind_of ActionController::AbstractRequest, assigns['request']
+    end
+    assert_not_deprecated do
+      assert_kind_of ActionController::AbstractRequest, @response.template.request
+      assert_kind_of ActionController::AbstractRequest, assigns['_request']
+    end
+  ensure
     ActionController::Base.view_controller_internals = view_internals_old_value
     ActionController::Base.protected_variables_cache = nil
   end
   def test_render_xml
     get :render_xml_hello
     assert_equal "<html>\n  <p>Hello David</p>\n<p>This is grand!</p>\n</html>\n", @response.body
@@ -429,17 +498,17 @@ EOS
   def test_render_rjs_with_default
     get :delete_with_js
-    assert_equal %!["person"].each(Element.remove);\nnew Effect.Highlight(\"project-4\",{});!, @response.body
+    assert_equal %!Element.remove("person");\nnew Effect.Highlight(\"project-4\",{});!, @response.body
   end
   def test_render_rjs_template_explicitly
     get :render_js_with_explicit_template
-    assert_equal %!["person"].each(Element.remove);\nnew Effect.Highlight(\"project-4\",{});!, @response.body
+    assert_equal %!Element.remove("person");\nnew Effect.Highlight(\"project-4\",{});!, @response.body
   end
   def test_rendering_rjs_action_explicitly
     get :render_js_with_explicit_action_template
-    assert_equal %!["person"].each(Element.remove);\nnew Effect.Highlight(\"project-4\",{});!, @response.body
+    assert_equal %!Element.remove("person");\nnew Effect.Highlight(\"project-4\",{});!, @response.body
   end
   def test_layout_rendering
@@ -483,9 +552,31 @@ EOS
   end
   def test_render_to_string
-    get :hello_in_a_string
+    assert_not_deprecated { get :hello_in_a_string }
     assert_equal "How's there? goodbyeHello: davidHello: marygoodbye\n", @response.body
   end
+  def test_render_to_string_doesnt_break_assigns
+    get :render_to_string_with_assigns
+    assert_equal "i'm before the render", assigns(:before)
+    assert_equal "i'm after the render", assigns(:after)
+  end
+  def test_render_to_string_partial
+    get :render_to_string_with_partial
+    assert_equal "only partial", assigns(:partial_only)
+    assert_equal "Hello: david", assigns(:partial_with_locals)
+  end
+  def test_bad_render_to_string_still_throws_exception
+    assert_raises(ActionController::MissingTemplate) { get :render_to_string_with_exception }
+  end
+  def test_render_to_string_that_throws_caught_exception_doesnt_break_assigns
+    assert_nothing_raised { get :render_to_string_with_caught_exception }
+    assert_equal "i'm before the render", assigns(:before)
+    assert_equal "i'm after the render", assigns(:after)
+  end
   def test_nested_rendering
     get :hello_world
@@ -503,7 +594,7 @@ EOS
   end
   def test_render_with_explicit_template
-    get :render_with_explicit_template
+    assert_deprecated(/render/) { get :render_with_explicit_template }
     assert_response :success
   end
@@ -518,6 +609,12 @@ EOS
   def test_render_and_redirect
     assert_raises(ActionController::DoubleRenderError) { get :render_and_redirect }
   end
+  # specify the one exception to double render rule - render_to_string followed by render
+  def test_render_to_string_and_render
+    get :render_to_string_and_render
+    assert_equal("Hi web users! here is some cached stuff", @response.body)
+  end
   def test_rendering_with_conflicting_local_vars
     get :rendering_with_conflicting_local_vars
@@ -572,20 +669,20 @@ EOS
   def test_update_page
     get :update_page
     assert_template nil
-    assert_equal 'text/javascript; charset=UTF-8', @response.headers['Content-Type']
+    assert_equal 'text/javascript; charset=utf-8', @response.headers['Content-Type']
     assert_equal 2, @response.body.split($/).length
   end
   def test_update_page_with_instance_variables
     get :update_page_with_instance_variables
     assert_template nil
-    assert_equal 'text/javascript; charset=UTF-8', @response.headers['Content-Type']
+    assert_equal 'text/javascript; charset=utf-8', @response.headers['Content-Type']
     assert_match /balance/, @response.body
     assert_match /\$37/, @response.body
   end
   def test_yield_content_for
-    get :yield_content_for
+    assert_not_deprecated { get :yield_content_for }
     assert_equal "<title>Putting stuff in the title!</title>\n\nGreat stuff!\n", @response.body
   end
@@ -597,4 +694,57 @@ EOS
     get :hello_world_from_rxml_using_action
     assert_equal "<html>\n  <p>Hello</p>\n</html>\n", @response.body
   end
+  def test_head_with_location_header
+    get :head_with_location_header
+    assert @response.body.blank?
+    assert_equal "/foo", @response.headers["Location"]
+    assert_response :ok
+  end
+  def test_head_with_custom_header
+    get :head_with_custom_header
+    assert @response.body.blank?
+    assert_equal "something", @response.headers["X-Custom-Header"]
+    assert_response :ok
+  end
+  def test_head_with_symbolic_status
+    get :head_with_symbolic_status, :status => "ok"
+    assert_equal "200 OK", @response.headers["Status"]
+    assert_response :ok
+    get :head_with_symbolic_status, :status => "not_found"
+    assert_equal "404 Not Found", @response.headers["Status"]
+    assert_response :not_found
+    ActionController::StatusCodes::SYMBOL_TO_STATUS_CODE.each do |status, code|
+      get :head_with_symbolic_status, :status => status.to_s
+      assert_equal code, @response.response_code
+      assert_response status
+    end
+  end
+  def test_head_with_integer_status
+    ActionController::StatusCodes::STATUS_CODES.each do |code, message|
+      get :head_with_integer_status, :status => code.to_s
+      assert_equal message, @response.message
+    end
+  end
+  def test_head_with_string_status
+    get :head_with_string_status, :status => "404 Eat Dirt"
+    assert_equal 404, @response.response_code
+    assert_equal "Eat Dirt", @response.message
+    assert_response :not_found
+  end
+  def test_head_with_status_code_first
+    get :head_with_status_code_first
+    assert_equal 403, @response.response_code
+    assert_equal "Forbidden", @response.message
+    assert_equal "something", @response.headers["X-Custom-Header"]
+    assert_response :forbidden
+  end
 end

data/test/controller/raw_post_test.rb CHANGED

@@ -5,27 +5,64 @@ require File.dirname(__FILE__) + '/../../lib/action_controller/cgi_ext/raw_post_
 class RawPostDataTest < Test::Unit::TestCase
   def setup
+    ENV.delete('RAW_POST_DATA')
+    @request_body = 'a=1'
+  end
+  def test_post_with_urlencoded_body
+    ENV['REQUEST_METHOD'] = 'POST'
+    ENV['CONTENT_TYPE'] = ' apPlication/x-Www-form-urlEncoded; charset=utf-8'
+    assert_equal ['1'], cgi_params['a']
+    assert_has_raw_post_data
+  end
+  def test_post_with_empty_content_type_treated_as_urlencoded
     ENV['REQUEST_METHOD'] = 'POST'
     ENV['CONTENT_TYPE'] = ''
-    ENV['CONTENT_LENGTH'] = '0'
+    assert_equal ['1'], cgi_params['a']
+    assert_has_raw_post_data
+  end
+  def test_post_with_unrecognized_content_type_reads_body_but_doesnt_parse_params
+    ENV['REQUEST_METHOD'] = 'POST'
+    ENV['CONTENT_TYPE'] = 'foo/bar'
+    assert cgi_params.empty?
+    assert_has_raw_post_data
   end
-  def test_raw_post_data
-    process_raw "action=create_customer&full_name=David%20Heinemeier%20Hansson&customerId=1"
+  def test_put_with_urlencoded_body
+    ENV['REQUEST_METHOD'] = 'PUT'
+    ENV['CONTENT_TYPE'] = 'application/x-www-form-urlencoded'
+    assert_equal ['1'], cgi_params['a']
+    assert_has_raw_post_data
+  end
+  def test_put_with_empty_content_type_ignores_body
+    ENV['REQUEST_METHOD'] = 'PUT'
+    ENV['CONTENT_TYPE'] = ''
+    assert cgi_params.empty?
+    assert_has_raw_post_data
+  end
+  def test_put_with_unrecognized_content_type_ignores_body
+    ENV['REQUEST_METHOD'] = 'PUT'
+    ENV['CONTENT_TYPE'] = 'foo/bar'
+    assert cgi_params.empty?
+    assert_has_raw_post_data
   end
   private
-    def process_raw(query_string)
-      old_stdin = $stdin
-      begin
-        $stdin = StringIO.new(query_string.dup)
-        ENV['CONTENT_LENGTH'] = $stdin.size.to_s
-        CGI.new
-        assert_not_nil ENV['RAW_POST_DATA']
-        assert ENV['RAW_POST_DATA'].frozen?
-        assert_equal query_string, ENV['RAW_POST_DATA']
-      ensure
-        $stdin = old_stdin
-      end
+    def cgi_params
+      old_stdin, $stdin = $stdin, StringIO.new(@request_body.dup)
+      ENV['CONTENT_LENGTH'] = $stdin.size.to_s
+      CGI.new.params
+    ensure
+      $stdin = old_stdin
+    end
+    def assert_has_raw_post_data(expected_body = @request_body)
+      assert_not_nil ENV['RAW_POST_DATA']
+      assert ENV['RAW_POST_DATA'].frozen?
+      assert_equal expected_body, ENV['RAW_POST_DATA']
     end
 end

data/test/controller/redirect_test.rb CHANGED

@@ -45,52 +45,60 @@ class RedirectTest < Test::Unit::TestCase
   def test_simple_redirect
     get :simple_redirect
-    assert_redirect_url "http://test.host/redirect/hello_world"
+    assert_response :redirect
+    assert_equal "http://test.host/redirect/hello_world", redirect_to_url
   end
   def test_redirect_with_method_reference_and_parameters
-    get :method_redirect
-    assert_redirect_url "http://test.host/redirect/dashboard/1?message=hello"
+    assert_deprecated(/redirect_to/) { get :method_redirect }
+    assert_response :redirect
+    assert_equal "http://test.host/redirect/dashboard/1?message=hello", redirect_to_url
   end
   def test_simple_redirect_using_options
     get :host_redirect
+    assert_response :redirect
     assert_redirected_to :action => "other_host", :only_path => false, :host => 'other.test.host'
   end
   def test_redirect_error_with_pretty_diff
     get :host_redirect
+    assert_response :redirect
     begin
       assert_redirected_to :action => "other_host", :only_path => true
     rescue Test::Unit::AssertionFailedError => err
       redirection_msg, diff_msg = err.message.scan(/<\{[^\}]+\}>/).collect { |s| s[2..-3] }
-      assert_match %r(:only_path=>false),        redirection_msg
-      assert_match %r(:host=>"other.test.host"), redirection_msg
-      assert_match %r(:action=>"other_host"),    redirection_msg
-      assert_match %r(:only_path=>true),         diff_msg
-      assert_match %r(:host=>"other.test.host"), diff_msg
+      assert_match %r("only_path"=>false),        redirection_msg
+      assert_match %r("host"=>"other.test.host"), redirection_msg
+      assert_match %r("action"=>"other_host"),    redirection_msg
+      assert_match %r("only_path"=>true),         diff_msg
+      assert_match %r("host"=>"other.test.host"), diff_msg
     end
   end
   def test_module_redirect
     get :module_redirect
-    assert_redirect_url "http://test.host/module_test/module_redirect/hello_world"
+    assert_response :redirect
+    assert_redirected_to "http://test.host/module_test/module_redirect/hello_world"
   end
   def test_module_redirect_using_options
     get :module_redirect
+    assert_response :redirect
     assert_redirected_to :controller => 'module_test/module_redirect', :action => 'hello_world'
   end
   def test_redirect_with_assigns
     get :redirect_with_assigns
+    assert_response :redirect
     assert_equal "world", assigns["hello"]
   end
   def test_redirect_to_back
     @request.env["HTTP_REFERER"] = "http://www.example.com/coming/from"
     get :redirect_to_back
-    assert_redirect_url "http://www.example.com/coming/from"
+    assert_response :redirect
+    assert_equal "http://www.example.com/coming/from", redirect_to_url
   end
   def test_redirect_to_back_with_no_referer
@@ -117,26 +125,31 @@ module ModuleTest
     def test_simple_redirect
       get :simple_redirect
-      assert_redirect_url "http://test.host/module_test/module_redirect/hello_world"
+      assert_response :redirect
+      assert_equal "http://test.host/module_test/module_redirect/hello_world", redirect_to_url
     end
     def test_redirect_with_method_reference_and_parameters
-      get :method_redirect
-      assert_redirect_url "http://test.host/module_test/module_redirect/dashboard/1?message=hello"
+      assert_deprecated(/redirect_to/) { get :method_redirect }
+      assert_response :redirect
+      assert_equal "http://test.host/module_test/module_redirect/dashboard/1?message=hello", redirect_to_url
     end
     def test_simple_redirect_using_options
       get :host_redirect
+      assert_response :redirect
       assert_redirected_to :action => "other_host", :only_path => false, :host => 'other.test.host'
     end
     def test_module_redirect
       get :module_redirect
-      assert_redirect_url "http://test.host/redirect/hello_world"
+      assert_response :redirect
+      assert_equal "http://test.host/redirect/hello_world", redirect_to_url
     end
     def test_module_redirect_using_options
       get :module_redirect
+      assert_response :redirect
       assert_redirected_to :controller => 'redirect', :action => "hello_world"
     end
   end