X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Faggregate%2Funit_core_uri_for_action.t;h=c95f97811b4068331936ed5a4615d96be17a0bd1;hb=2ebbf7b954a7c5bf5024a9788728386b37e61e55;hp=9b845829b6ccc1e6472fff2024dec50d11f949c6;hpb=42da66a91b0a87ebb81d8552bcd0b05d3557c83e;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 9b84582..c95f978 100644
--- a/t/aggregate/unit_core_uri_for_action.t
+++ b/t/aggregate/unit_core_uri_for_action.t
@@ -6,9 +6,7 @@ use warnings;
 use FindBin;
 use lib "$FindBin::Bin/../lib";
 
-use Test::More;
-
-plan tests => 28;
+use Test::More 0.88;
 
 use_ok('TestApp');
 
@@ -54,6 +52,21 @@ is($dispatcher->uri_for_action($regex_action, [ 'foo', 123 ]),
    "/action/regexp/foo/123",
    "Regex action interpolates captures correctly");
 
+my $regex_action_bs = $dispatcher->get_action_by_path(
+                     '/action/regexp/one_backslashes'
+                   );
+
+ok(!defined($dispatcher->uri_for_action($regex_action_bs)),
+   "Regex action without captures returns undef");
+
+ok(!defined($dispatcher->uri_for_action($regex_action_bs, [ 1, 2, 3 ])),
+   "Regex action with too many captures returns undef");
+
+is($dispatcher->uri_for_action($regex_action_bs, [ 'foo', 123 ]),
+   "/action/regexp/foo/123.html",
+   "Regex action interpolates captures correctly");
+
+
 #
 #   Index Action
 #
@@ -97,6 +110,10 @@ my $context = TestApp->new( {
                 namespace => 'yada',
               } );
 
+is($context->uri_for($context->controller('Action')),
+   "http://127.0.0.1/foo/yada/action/",
+   "uri_for a controller");
+
 is($context->uri_for($path_action),
    "http://127.0.0.1/foo/action/relative/relative",
    "uri_for correct for path action");
@@ -120,52 +137,91 @@ is($context->uri_for($chained_action, [ 1 ], 2, { q => 1 }),
 #   More Chained with Context Tests
 #
 {
-    sub __action { $dispatcher->get_action_by_path( @_ ) }
+    is( $context->uri_for_action( '/action/chained/endpoint2', [1,2], (3,4), { x => 5 } ),
+        'http://127.0.0.1/foo/chained/foo2/1/2/end2/3/4?x=5',
+        'uri_for_action correct for chained with multiple captures and args' );
 
-    is( $context->uri_for( __action( '/action/chained/endpoint2' ), [1,2], (3,4), { x => 5 } ),
+    is( $context->uri_for_action( '/action/chained/endpoint2', [1,2,3,4], { x => 5 } ),
         'http://127.0.0.1/foo/chained/foo2/1/2/end2/3/4?x=5',
-        'uri_for correct for chained with multiple captures and args' );
+        'uri_for_action correct for chained with multiple captures and args combined' );
 
-    is( $context->uri_for( __action( '/action/chained/three_end' ), [1,2,3], (4,5,6) ),
+    is( $context->uri_for_action( '/action/chained/three_end', [1,2,3], (4,5,6) ),
         'http://127.0.0.1/foo/chained/one/1/two/2/3/three/4/5/6',
-        'uri_for correct for chained with multiple capturing actions' );
+        'uri_for_action correct for chained with multiple capturing actions' );
 
-    my $action_needs_two = __action( '/action/chained/endpoint2' );
+    is( $context->uri_for_action( '/action/chained/three_end', [1,2,3,4,5,6] ),
+        'http://127.0.0.1/foo/chained/one/1/two/2/3/three/4/5/6',
+        'uri_for_action correct for chained with multiple capturing actions and args combined' );
+
+    my $action_needs_two = '/action/chained/endpoint2';
     
-    ok( ! defined( $context->uri_for($action_needs_two, [1],     (2,3)) ),
-        'uri_for returns undef for not enough captures' );
+    ok( ! defined( $context->uri_for_action($action_needs_two, [1],     (2,3)) ),
+        'uri_for_action returns undef for not enough captures' );
         
-    is( $context->uri_for($action_needs_two,            [1,2],   (2,3)),
+    is( $context->uri_for_action($action_needs_two,            [1,2],   (2,3)),
         'http://127.0.0.1/foo/chained/foo2/1/2/end2/2/3',
-        'uri_for returns correct uri for correct captures' );
-        
-    ok( ! defined( $context->uri_for($action_needs_two, [1,2,3], (2,3)) ),
-        'uri_for returns undef for too many captures' );
+        'uri_for_action returns correct uri for correct captures' );
+
+    is( $context->uri_for_action($action_needs_two,            [1,2,2,3]),
+        'http://127.0.0.1/foo/chained/foo2/1/2/end2/2/3',
+        'uri_for_action returns correct uri for correct captures and args combined' );
+
+    ok( ! defined( $context->uri_for_action($action_needs_two, [1,2,3], (2,3)) ),
+        'uri_for_action returns undef for too many captures' );
     
-    is( $context->uri_for($action_needs_two, [1,2],   (3)),
+    is( $context->uri_for_action($action_needs_two, [1,2],   (3)),
+        'http://127.0.0.1/foo/chained/foo2/1/2/end2/3',
+        'uri_for_action returns uri with lesser args than specified on action' );
+
+    is( $context->uri_for_action($action_needs_two, [1,2,3]),
         'http://127.0.0.1/foo/chained/foo2/1/2/end2/3',
-        'uri_for returns uri with lesser args than specified on action' );
+        'uri_for_action returns uri with lesser args than specified on action with captures combined' );
 
-    is( $context->uri_for($action_needs_two, [1,2],   (3,4,5)),
+    is( $context->uri_for_action($action_needs_two, [1,2],   (3,4,5)),
         'http://127.0.0.1/foo/chained/foo2/1/2/end2/3/4/5',
-        'uri_for returns uri with more args than specified on action' );
+        'uri_for_action returns uri with more args than specified on action' );
+
+    is( $context->uri_for_action($action_needs_two, [1,2,3,4,5]),
+        'http://127.0.0.1/foo/chained/foo2/1/2/end2/3/4/5',
+        'uri_for_action returns uri with more args than specified on action with captures combined' );
+
+    is( $context->uri_for_action($action_needs_two, [1,''], (3,4)),
+        'http://127.0.0.1/foo/chained/foo2/1//end2/3/4',
+        'uri_for_action returns uri with empty capture on undef capture' );
 
-    is( $context->uri_for($action_needs_two, [1,''], (3,4)),
+    is( $context->uri_for_action($action_needs_two, [1,'',3,4]),
         'http://127.0.0.1/foo/chained/foo2/1//end2/3/4',
-        'uri_for returns uri with empty capture on undef capture' );
+        'uri_for_action returns uri with empty capture on undef capture and args combined' );
 
-    is( $context->uri_for($action_needs_two, [1,2], ('',3)),
+    is( $context->uri_for_action($action_needs_two, [1,2], ('',3)),
         'http://127.0.0.1/foo/chained/foo2/1/2/end2//3',
-        'uri_for returns uri with empty arg on undef argument' );
+        'uri_for_action returns uri with empty arg on undef argument' );
 
-    is( $context->uri_for($action_needs_two, [1,2], (3,'')),
+    is( $context->uri_for_action($action_needs_two, [1,2,'',3]),
+        'http://127.0.0.1/foo/chained/foo2/1/2/end2//3',
+        'uri_for_action returns uri with empty arg on undef argument and args combined' );
+
+    is( $context->uri_for_action($action_needs_two, [1,2], (3,'')),
+        '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, [1,2,3,'']),
         'http://127.0.0.1/foo/chained/foo2/1/2/end2/3/',
-        'uri_for returns uri with empty arg on undef last argument' );
+        'uri_for_action returns uri with empty arg on undef last argument with captures combined' );
 
-    my $complex_chained = __action( '/action/chained/empty_chain_f' );
-    is( $context->uri_for( $complex_chained, [23], (13), {q => 3} ),
+    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 returns correct uri for chain with many empty path parts' );
+        'uri_for_action returns correct uri for chain with many empty path parts' );
+    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 with captures and args combined' );
+
+    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';
+
 }
 
+done_testing;