From: John Napiorkowski Date: Tue, 24 Mar 2015 14:34:51 +0000 (-0500) Subject: fail test case for args0 issue X-Git-Tag: 5.90089_002~29 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=aef0cb5dc1b5dbadba8f6345587ea2012011108f fail test case for args0 issue --- diff --git a/lib/Catalyst/Action.pm b/lib/Catalyst/Action.pm index 8c86df0..5ee38e9 100644 --- a/lib/Catalyst/Action.pm +++ b/lib/Catalyst/Action.pm @@ -272,6 +272,8 @@ sub execute { sub match { my ( $self, $c ) = @_; + warn $self->reverse; + # If infinite args, we always match return 1 if $self->normalized_arg_number == ~0; diff --git a/t/arg_constraints.t b/t/arg_constraints.t index b42b007..a1cd3fd 100644 --- a/t/arg_constraints.t +++ b/t/arg_constraints.t @@ -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,15 @@ 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_post2 :POST 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 :POST 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'); @@ -325,18 +331,33 @@ SKIP: { =cut { - my $res = request PUT '/chain_base/capture'; - is $res->content, 'chained_zero'; + my $res = request PUT '/chain_base2/capture/1'; + is $res->content, 'chained_zero3'; +} + +{ + my $res = request '/chain_base2/capture/1'; + is $res->content, 'chained_zero3'; +} + +{ + my $res = request POST '/chain_base2/capture/1'; + is $res->content, 'chained_zero3'; +} + +{ + my $res = request PUT '/chain_base2/capture'; + is $res->content, 'chained_zero2'; } { - my $res = request '/chain_base/capture'; - is $res->content, 'chained_zero'; + my $res = request '/chain_base2/capture'; + is $res->content, 'chained_zero2'; } { - 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'; } =over @@ -348,6 +369,10 @@ SKIP: { =cut + +done_testing; + +__END__ { # URI testing my ($res, $c) = ctx_request '/'; @@ -358,4 +383,3 @@ SKIP: { warn $url2; } -done_testing;