X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Faggregate%2Funit_core_uri_for_action.t;h=53d71df91f57c2120914a4c4a997af124ad95867;hb=aa2e6d9e59b1373b13fe7c37725f3fab3b8a1e92;hp=833677933c7a461bdd3d08f33ece5434904a67be;hpb=833b385e3d6454bd249acf859869bf1792109b82;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/aggregate/unit_core_uri_for_action.t b/t/aggregate/unit_core_uri_for_action.t
index 8336779..53d71df 100644
--- a/t/aggregate/unit_core_uri_for_action.t
+++ b/t/aggregate/unit_core_uri_for_action.t
@@ -8,7 +8,7 @@ use lib "$FindBin::Bin/../lib";
 
 use Test::More;
 
-plan tests => 28;
+plan tests => 33;
 
 use_ok('TestApp');
 
@@ -54,6 +54,10 @@ is($dispatcher->uri_for_action($regex_action, [ 'foo', 123 ]),
    "/action/regexp/foo/123",
    "Regex action interpolates captures correctly");
 
+is($dispatcher->uri_for_action($regex_action, [ 'foo/bar', 123 ]),
+   "/action/regexp/foo%2Fbar/123",
+   "Regex action interpolates captures correctly and url encodes /");
+
 #
 #   Index Action
 #
@@ -105,6 +109,10 @@ is($context->uri_for($path_action, qw/one two/, { q => 1 }),
    "http://127.0.0.1/foo/action/relative/relative/one/two?q=1",
    "uri_for correct for path action with args and query");
 
+is($context->uri_for($path_action, qw|one/quux two|),
+   "http://127.0.0.1/foo/action/relative/relative/one%2Fquux/two",
+   "uri_for correctly url encoded for path action with args containing /");
+
 ok(!defined($context->uri_for($path_action, [ 'blah' ])),
    "no URI returned by uri_for for Path action with snippets");
 
@@ -160,10 +168,22 @@ is($context->uri_for($chained_action, [ 1 ], 2, { q => 1 }),
         'http://127.0.0.1/foo/chained/foo2/1/2/end2/3/',
         'uri_for_action returns uri with empty arg on undef last argument' );
 
+    is( $context->uri_for_action($action_needs_two, [ 'foo' , 'bar/baz' ], (3,4)),
+        'http://127.0.0.1/foo/chained/foo2/foo/bar%2Fbaz/end2/3/4',
+        'uri_for_action works correctly when CaptureArg contains /' );
+
+    is( $context->uri_for_action($action_needs_two, [ 'foo' , 'bar' ], ('3/baz',4)),
+        'http://127.0.0.1/foo/chained/foo2/foo/bar/end2/3%2Fbaz/4',
+        'uri_for_action works correctly when Args contains /' );
+
     my $complex_chained = '/action/chained/empty_chain_f';
     is( $context->uri_for_action( $complex_chained, [23], (13), {q => 3} ),
         'http://127.0.0.1/foo/chained/empty/23/13?q=3',
         'uri_for_action returns correct uri for chain with many empty path parts' );
-}
 
+    eval { $context->uri_for_action( '/does/not/exist' ) };
+    like $@, qr{^Can't find action for path '/does/not/exist'},
+        'uri_for_action croaks on nonexistent path';
+
+}