aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEloy Duran <eloy.de.enige@gmail.com>2008-10-13 16:08:41 +0200
committerPratik Naik <pratiknaik@gmail.com>2008-10-13 18:38:48 +0200
commitb47c76b1dfaaf1d99413b94179077cd58552ba88 (patch)
treeb996916760c1056cb1c8d8193bc0ae18e64e4787
parent1b44bbff425711d62d81e6565eb3afc2ba77bc4b (diff)
downloadrails-b47c76b1dfaaf1d99413b94179077cd58552ba88.tar.gz
rails-b47c76b1dfaaf1d99413b94179077cd58552ba88.tar.bz2
rails-b47c76b1dfaaf1d99413b94179077cd58552ba88.zip
Make sure named routes with parameters can be used in tests before a request has been done. [#1208 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
-rw-r--r--actionpack/lib/action_controller/test_case.rb3
-rw-r--r--actionpack/test/controller/test_test.rb1
2 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 6a39039504..4fc60f0697 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -134,6 +134,9 @@ module ActionController
@controller = self.class.controller_class.new
@controller.request = @request = TestRequest.new
@response = TestResponse.new
+
+ @controller.params = {}
+ @controller.send(:initialize_current_url)
end
# Cause the action to be rescued according to the regular rules for rescue_action when the visitor is not local
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index 9eff34a542..a23428804a 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -667,6 +667,7 @@ class NamedRoutesControllerTest < ActionController::TestCase
with_routing do |set|
set.draw { |map| map.resources :contents }
assert_equal 'http://test.host/contents/new', new_content_url
+ assert_equal 'http://test.host/contents/1', content_url(:id => 1)
end
end
end