X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Farg_constraints.t;h=8d74aa87d131f845ce51d64147de5b19b054dec6;hp=fb3a3a7f0971104c0464030825c9f6bf301e26cf;hb=70949f28d6d56c8c882cd937b9c3be5e04aaba62;hpb=b40370866bf21a54428e3193b83ea6dabdd70d9e diff --git a/t/arg_constraints.t b/t/arg_constraints.t index fb3a3a7..8d74aa8 100644 --- a/t/arg_constraints.t +++ b/t/arg_constraints.t @@ -4,7 +4,7 @@ use HTTP::Request::Common; BEGIN { use Test::More; - eval "use Types::Standard; 1;" || do { + eval "use Types::Standard; use Type::Utils; use Type::Library; 1;" || do { plan skip_all => "Trouble loading Types::Standard => $@"; }; @@ -106,9 +106,6 @@ BEGIN { sub chain_base :Chained(/) CaptureArgs(1) { } - sub chained_zero_post :POST Chained(chain_base) PathPart('') Args(0) { $_[1]->res->body('chained_zero_post') } - sub chained_zero : Chained(chain_base) PathPart('') Args(0) { $_[1]->res->body('chained_zero') } - sub any_priority_chain :GET Chained(chain_base) PathPart('') Args(1) { $_[1]->res->body('any_priority_chain') } sub int_priority_chain :Chained(chain_base) PathPart('') Args(Int) { $_[1]->res->body('int_priority_chain') } @@ -142,6 +139,16 @@ BEGIN { sub finally2 :GET Chained(link2_int) PathPart('') Args { $_[1]->res->body('finally2') } sub finally :GET Chained(link2_int) PathPart('') Args(Int) { $_[1]->res->body('finally') } + sub chain_base2 :Chained(/) CaptureArgs(1) { } + + sub chained_zero_again : Chained(chain_base2) PathPart('') Args(0) { $_[1]->res->body('chained_zero_again') } + sub chained_zero_post2 : Chained(chain_base2) PathPart('') Args(0) { $_[1]->res->body('chained_zero_post2') } + sub chained_zero2 : Chained(chain_base2) PathPart('') Args(0) { $_[1]->res->body('chained_zero2') } + + sub chained_zero_post3 : Chained(chain_base2) PathPart('') Args(1) { $_[1]->res->body('chained_zero_post3') } + sub chained_zero3 : Chained(chain_base2) PathPart('') Args(1) { $_[1]->res->body('chained_zero3') } + + sub default :Default { my ($self, $c, $int) = @_; $c->res->body('default'); @@ -315,28 +322,35 @@ SKIP: { is $res->content, 'finally2'; } -=over -| /chain_base/* | /chain_base (1) | -| | => /chained_zero (0) | -| /chain_base/* | /chain_base (1) | -| | => POST /chained_zero_post (0) +{ + my $res = request PUT '/chain_base2/capture/1'; + is $res->content, 'chained_zero3', "request PUT '/chain_base2/capture/1'"; +} -=cut +{ + my $res = request '/chain_base2/capture/1'; + is $res->content, 'chained_zero3', "request '/chain_base2/capture/1'"; +} + +{ + my $res = request POST '/chain_base2/capture/1'; + is $res->content, 'chained_zero3', "request POST '/chain_base2/capture/1'"; +} { - my $res = request PUT '/chain_base/capture'; - is $res->content, 'chained_zero'; + my $res = request PUT '/chain_base2/capture'; + is $res->content, 'chained_zero2', "request PUT '/chain_base2/capture'"; } { - my $res = request '/chain_base/capture'; - is $res->content, 'chained_zero'; + my $res = request '/chain_base2/capture'; + is $res->content, 'chained_zero2', "request '/chain_base2/capture'"; } { - my $res = request POST '/chain_base/capture'; - is $res->content, 'chained_zero_post'; + my $res = request POST '/chain_base2/capture'; + is $res->content, 'chained_zero2', "request POST '/chain_base2/capture'"; } =over @@ -348,6 +362,10 @@ SKIP: { =cut + +done_testing; + +__END__ { # URI testing my ($res, $c) = ctx_request '/'; @@ -358,4 +376,3 @@ SKIP: { warn $url2; } -done_testing;