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=80b53f622a857f52d88b962c9999e2f83ddb27ca;hp=fb3a3a7f0971104c0464030825c9f6bf301e26cf;hb=c1192f1ed63f124eb2d143e10b215703e7dc6284;hpb=b40370866bf21a54428e3193b83ea6dabdd70d9e

diff --git a/t/arg_constraints.t b/t/arg_constraints.t
index fb3a3a7..80b53f6 100644
--- a/t/arg_constraints.t
+++ b/t/arg_constraints.t
@@ -4,10 +4,12 @@ use HTTP::Request::Common;
 
 BEGIN {
   use Test::More;
-  eval "use Types::Standard; 1;" || do {
-    plan skip_all => "Trouble loading Types::Standard => $@";
+  eval "use Type::Tiny; 1" || do {
+    plan skip_all => "Trouble loading Type::Tiny and friends => $@";
   };
+}
 
+BEGIN {
   package MyApp::Types;
   $INC{'MyApp/Types.pm'} = __FILE__;
 
@@ -106,9 +108,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 +141,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 +324,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
@@ -356,6 +372,17 @@ SKIP: {
 
   ok my $url2 = $c->uri_for($c->controller('Root')->action_for('finally'), [1,2,3,4,5,6]);
   warn $url2;
+
+  ok my $url3 = $c->uri_for($c->controller('Root')->action_for('user'), 2);
+  warn $url3;
+
+  ok my $url4 = $c->uri_for($c->controller('Root')->action_for('user'), [2]);
+  warn $url4;
+
 }
 
 done_testing;
+
+__END__
+
+