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=d4f4148ebcfa56f05d2bf7a5170b361d5ea38f2a;hpb=dcac0a272606616a591d345e982db88013704d0a;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 d4f4148..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"); @@ -120,52 +128,62 @@ is($context->uri_for($chained_action, [ 1 ], 2, { q => 1 }), # More Chained with Context Tests # { - sub __action { shift->get_action_by_path( @_ ) } - - is( $context->uri_for( __action( $dispatcher, '/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' ); - is( $context->uri_for( __action( $dispatcher, '/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( $dispatcher, '/action/chained/endpoint2' ); + 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' ); + 'uri_for_action 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' ); + 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 returns uri with lesser args than specified on action' ); + 'uri_for_action returns uri with lesser args than specified on action' ); - 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_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' ); - 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 returns uri with empty arg on undef last argument' ); + '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 /' ); - my $complex_chained = __action( $dispatcher, '/action/chained/empty_chain_f' ); - is( $context->uri_for( $complex_chained, [23], (13), {q => 3} ), + 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 returns correct uri for chain with many empty path parts' ); -} + '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'; + +}