X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Faggregate%2Funit_core_uri_for_action.t;h=4036f88f1e1d9ab9600e1474b9c187aa0c0819ac;hb=a0b5065e3dd43fea2ca17f4f2ae7cbe1958057d4;hp=f7cd481eb6ace4bb81de8fd3365ba74eabea7cce;hpb=0cff119a540a3c8961750bd499f4c470771ac342;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 f7cd481..4036f88 100644 --- a/t/aggregate/unit_core_uri_for_action.t +++ b/t/aggregate/unit_core_uri_for_action.t @@ -1,5 +1,3 @@ -#!perl - use strict; use warnings; @@ -36,38 +34,6 @@ ok(!defined($dispatcher->uri_for_action($path_action, [ 'foo' ])), "no URI returned for Path action when snippets are given"); # -# Regex Action -# -my $regex_action = $dispatcher->get_action_by_path( - '/action/regexp/one' - ); - -ok(!defined($dispatcher->uri_for_action($regex_action)), - "Regex action without captures returns undef"); - -ok(!defined($dispatcher->uri_for_action($regex_action, [ 1, 2, 3 ])), - "Regex action with too many captures returns undef"); - -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 # my $index_action = $dispatcher->get_action_by_path( @@ -102,6 +68,7 @@ is($dispatcher->uri_for_action($chained_action, [ 1 ]), # Tests with Context # my $request = Catalyst::Request->new( { + _log => Catalyst::Log->new, base => URI->new('http://127.0.0.1/foo') } ); @@ -125,10 +92,6 @@ is($context->uri_for($path_action, qw/one two/, { q => 1 }), ok(!defined($context->uri_for($path_action, [ 'blah' ])), "no URI returned by uri_for for Path action with snippets"); -is($context->uri_for($regex_action, [ 'foo', 123 ], qw/bar baz/, { q => 1 }), - "http://127.0.0.1/foo/action/regexp/foo/123/bar/baz?q=1", - "uri_for correct for regex with captures, args and query"); - is($context->uri_for($chained_action, [ 1 ], 2, { q => 1 }), "http://127.0.0.1/foo/chained/foo/1/end/2?q=1", "uri_for correct for chained with captures, args and query");