X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Farg_constraints.t;h=4c29a43bc216ef32040396cf68a007336a7dc645;hb=25ca36c2fb3547600772a73c722a30b469ad632f;hp=b42b007507fadd332e8ac4ed88be3947cfd05dfd;hpb=6ca3b7de88bc467ca828496a614d84dc3a9a2b51;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/arg_constraints.t b/t/arg_constraints.t
index b42b007..4c29a43 100644
--- a/t/arg_constraints.t
+++ b/t/arg_constraints.t
@@ -1,13 +1,16 @@
 use warnings;
 use strict;
 use HTTP::Request::Common;
+use utf8;
 
 BEGIN {
   use Test::More;
-  eval "use Types::Standard; use Type::Utils; use Type::Library; 1;" || do {
-    plan skip_all => "Trouble loading Types::Standard => $@";
+  eval "use Type::Tiny 1.000005; 1" || do {
+    plan skip_all => "Trouble loading Type::Tiny and friends => $@";
   };
+}
 
+BEGIN {
   package MyApp::Types;
   $INC{'MyApp/Types.pm'} = __FILE__;
 
@@ -18,7 +21,7 @@ BEGIN {
   use Types::Standard -types;
   use Type::Library
    -base,
-   -declare => qw( UserId User ContextLike );
+   -declare => qw( UserId Heart User ContextLike );
 
   extends "Types::Standard"; 
 
@@ -29,6 +32,10 @@ BEGIN {
    as Int,
    where { $_ < 5 };
 
+  declare Heart,
+   as Str,
+   where { $_ eq '♥' };
+
   # Tests using this are skipped pending deeper thought
   coerce User,
    from ContextLike,
@@ -59,7 +66,7 @@ BEGIN {
 
   use Moose;
   use MooseX::MethodAttributes;
-  use MyApp::Types qw/Tuple Int Str StrMatch ArrayRef UserId User/;
+  use MyApp::Types qw/Tuple Int Str StrMatch ArrayRef UserId User Heart/;
 
   extends 'Catalyst::Controller';
 
@@ -106,9 +113,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 +146,21 @@ 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 heart :Local Args(Heart) { }
+
+  sub utf8_base :Chained(/) CaptureArgs(Heart) { }
+    sub utf8_end :Chained(utf8_base) PathPart('') Args(Heart) { }
+
   sub default :Default {
     my ($self, $c, $int) = @_;
     $c->res->body('default');
@@ -315,28 +334,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 PUT '/chain_base/capture';
-    is $res->content, 'chained_zero';
+    my $res = request POST '/chain_base2/capture/1';
+    is $res->content, 'chained_zero3', "request POST '/chain_base2/capture/1'";
 }
 
 {
-    my $res = request '/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 POST '/chain_base/capture';
-    is $res->content, 'chained_zero_post';
+    my $res = request '/chain_base2/capture';
+    is $res->content, 'chained_zero2', "request '/chain_base2/capture'";
+}
+
+{
+    my $res = request POST '/chain_base2/capture';
+    is $res->content, 'chained_zero2', "request POST '/chain_base2/capture'";
 }
 
 =over
@@ -351,11 +377,66 @@ SKIP: {
 {
   # URI testing
   my ($res, $c) = ctx_request '/';
-  ok my $url1 = $c->uri_for($c->controller('Root')->action_for('finally'), [1,2,3,4,5],6);
-  warn $url1;
 
-  ok my $url2 = $c->uri_for($c->controller('Root')->action_for('finally'), [1,2,3,4,5,6]);
-  warn $url2;
+  {
+    ok my $url = eval { $c->uri_for($c->controller('Root')->action_for('user'), 2) };
+    is $url, 'http://localhost/user/2';
+  }
+
+  {
+    ok my $url = eval { $c->uri_for($c->controller('Root')->action_for('user'), [2]) };
+    is $url, 'http://localhost/user/2';
+  }
+
+  {
+    ok my $url = ! eval { $c->uri_for($c->controller('Root')->action_for('user'), [20]) };
+  }
+
+  {
+    ok my $url = eval { $c->uri_for($c->controller('Root')->action_for('finally'), [1,2,3,4,4],6) };
+    is $url, 'http://localhost/chain_base/1/2/3/4/4/6';
+  }
+
+  {
+    ok my $url = eval { $c->uri_for($c->controller('Root')->action_for('finally'), [1,2,3,4,4,6]) };
+    is $url, 'http://localhost/chain_base/1/2/3/4/4/6';
+  }
+
+  {
+    ok my $url = ! eval { $c->uri_for($c->controller('Root')->action_for('finally'), [1,2,3,4,5,6]) };
+  }
+
+  {
+    ok my $url = eval { $c->uri_for($c->controller('Root')->action_for('finally'), ['a',2,3,4,4,6]) };
+    is $url, 'http://localhost/chain_base/a/2/3/4/4/6';
+  }
+
+  {
+    ok my $url = ! eval { $c->uri_for($c->controller('Root')->action_for('finally'), ['a','1',3,4,4,'a']) };
+  }
+
+  {
+    ok my $url = ! eval { $c->uri_for($c->controller('Root')->action_for('finally'), ['a','a',3,4,4,'6']) };
+  }
+
+  {
+    ok my $url = eval { $c->uri_for($c->controller('Root')->action_for('heart'), ['♥']) };
+    is $url, 'http://localhost/heart/%E2%99%A5';
+  }
+
+  {
+    ok my $url = ! eval { $c->uri_for($c->controller('Root')->action_for('heart'), ['1']) };
+  }
+
+  {
+    ok my $url = eval { $c->uri_for($c->controller('Root')->action_for('utf8_end'), ['♥','♥']) };
+    is $url, 'http://localhost/utf8_base/%E2%99%A5/%E2%99%A5';
+  }
+
+  {
+    ok my $url = ! eval { $c->uri_for($c->controller('Root')->action_for('utf8_end'), ['2','1']) };
+  }
+
 }
 
 done_testing;