aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-12-13 15:39:58 +0100
committerJosé Valim <jose.valim@gmail.com>2011-12-13 15:45:16 +0100
commit0f4da5b39394fe1096e93a7f2600f4d90330d1c0 (patch)
tree577885ce053b4e9946d8ab3fc687041ffa6e9c03 /actionpack
parent1668b900b5f1ba4793938922a5820efc67dac3d9 (diff)
downloadrails-0f4da5b39394fe1096e93a7f2600f4d90330d1c0.tar.gz
rails-0f4da5b39394fe1096e93a7f2600f4d90330d1c0.tar.bz2
rails-0f4da5b39394fe1096e93a7f2600f4d90330d1c0.zip
Fix failing AP tests.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/dispatch/routing_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 19eee379fd..bc4e2e31c8 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -2296,7 +2296,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
def test_named_routes_collision_is_avoided_unless_explicitly_given_as
assert_equal "/c/1", routes_collision_path(1)
- assert_equal "/forced_collision", routes_forced_collision_path
+ assert_equal "/fc", routes_forced_collision_path
end
def test_redirect_argument_error