aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorAndrew White <andyw@pixeltrix.co.uk>2010-08-20 17:33:33 +0100
committerJosé Valim <jose.valim@gmail.com>2010-08-20 14:51:25 -0300
commit7c9bf45b0dd7ad7a1d99a14566bfaeadc77b4665 (patch)
tree67c02994f8334d5fe51fa398f7c63f104ef45965 /actionpack/test
parent0420fb56475409c209193fbd45f9afffe8cd35eb (diff)
downloadrails-7c9bf45b0dd7ad7a1d99a14566bfaeadc77b4665.tar.gz
rails-7c9bf45b0dd7ad7a1d99a14566bfaeadc77b4665.tar.bz2
rails-7c9bf45b0dd7ad7a1d99a14566bfaeadc77b4665.zip
Support routing constraints in functional tests
Extend assert_recognizes and assert_generates to support passing full urls as the path argument. This allows testing of routing constraints such as subdomain and host within functional tests. [#5005 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/routing_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index fc85b01394..a8c74a6064 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -956,7 +956,7 @@ class RouteSetTest < ActiveSupport::TestCase
params = set.recognize_path("/people", :method => :put)
assert_equal("update", params[:action])
- assert_raise(ActionController::RoutingError) {
+ assert_raise(ActionController::UnknownHttpMethod) {
set.recognize_path("/people", :method => :bacon)
}