X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Faggregate%2Funit_core_uri_for_action.t;fp=t%2Faggregate%2Funit_core_uri_for_action.t;h=dfe36666368ccc49dac3f56b738311a611abe65e;hp=53d71df91f57c2120914a4c4a997af124ad95867;hb=f91554831ad9972ba44453f69a6b633fd3dfa710;hpb=83312afd857057c42c753255f804027ce3a76ce9 diff --git a/t/aggregate/unit_core_uri_for_action.t b/t/aggregate/unit_core_uri_for_action.t index 53d71df..dfe3666 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 => 33; +plan tests => 30; use_ok('TestApp'); @@ -54,10 +54,6 @@ 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 # @@ -109,10 +105,6 @@ 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"); @@ -169,12 +161,8 @@ is($context->uri_for($chained_action, [ 1 ], 2, { q => 1 }), '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 /' ); + 'http://127.0.0.1/foo/chained/foo2/foo/bar%2Fbaz/end2/3/', + 'uri_for_action returns uri with empty arg on undef last argument' ); my $complex_chained = '/action/chained/empty_chain_f'; is( $context->uri_for_action( $complex_chained, [23], (13), {q => 3} ),