From 930b59eb39e2078ae83159d72dee9389ecc04897 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sun, 26 Jun 2005 14:36:13 +0000
Subject: Fixed that Functional tests do not set request.path_parameters
 properly #1512 [Nicholas Seckar]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1527 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionpack/lib/action_controller/test_process.rb         | 16 +++++++++++++---
 .../test/controller/action_pack_assertions_test.rb       | 11 ++++++++++-
 2 files changed, 23 insertions(+), 4 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb
index 93d9dd8a2f..5248cd1e90 100644
--- a/actionpack/lib/action_controller/test_process.rb
+++ b/actionpack/lib/action_controller/test_process.rb
@@ -67,6 +67,13 @@ module ActionController #:nodoc:
       @path || super()
     end
     
+    def assign_parameters(parameters)
+      path, extras = ActionController::Routing::Routes.generate(parameters.symbolize_keys)
+      non_path_parameters = (get? ? query_parameters : request_parameters)
+      parameters.each do |key, value|
+        (extras.key?(key.to_sym) ? non_path_parameters : path_parameters)[key] = value
+      end
+    end
 
     private
       def initialize_containers
@@ -239,9 +246,12 @@ module Test
           @html_document = nil
           @request.env['REQUEST_METHOD'] ||= "GET"
           @request.action = action.to_s
-          @request.path_parameters = { :controller => @controller.class.controller_path,
-                                       :action => action.to_s }
-          @request.parameters.update(parameters) unless parameters.nil?
+
+          parameters ||= {}
+          parameters[:controller] = @controller.class.controller_path
+          parameters[:action] = action.to_s
+          @request.assign_parameters(parameters)
+
           @request.session = ActionController::TestSession.new(session) unless session.nil?
           @request.session["flash"] = ActionController::Flash::FlashHash.new.update(flash) if flash
           build_request_uri(action, parameters)
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index ccde516f31..4ecf6b6b5b 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -55,6 +55,10 @@ class ActionPackAssertionsController < ActionController::Base
     render_text "Mr. #{@params["name"]}"
   end
 
+  def render_url
+    render_text "<div>#{url_for(:action => 'flash_me', :only_path => true)}</div>"
+  end
+
   # puts something in the session
   def session_stuffing
     session['xmas'] = 'turkey'
@@ -97,6 +101,11 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
  
   # -- assertion-based testing ------------------------------------------------
 
+  def test_assert_tag_and_url_for
+    get :render_url
+    assert_tag :content => "/action_pack_assertions/flash_me"
+  end
+
   # test the session assertion to make sure something is there.
   def test_assert_session_has
     process :session_stuffing
@@ -359,7 +368,7 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
     assert_redirected_to :action => "flash_me"
     
     follow_redirect
-    assert_equal 1, @request.parameters["id"]
+    assert_equal 1, @request.parameters["id"].to_i
 
     assert "Inconceivable!", @response.body
   end
-- 
cgit v1.2.3