X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Flib%2FTestApp%2FController%2FAction%2FChildOf.pm;h=ba6e5d2c8fe44b0cd5ec59f813b765159dd1ac3a;hp=377c3d8b707c6ff3bb3709ea8d3f8ff34f871703;hb=09461385e3f0f62cbf3a95a71d00f71e1a42ca75;hpb=922c58d694a7e5a98f428332abac06587815de79

diff --git a/t/lib/TestApp/Controller/Action/ChildOf.pm b/t/lib/TestApp/Controller/Action/ChildOf.pm
index 377c3d8..ba6e5d2 100644
--- a/t/lib/TestApp/Controller/Action/ChildOf.pm
+++ b/t/lib/TestApp/Controller/Action/ChildOf.pm
@@ -7,26 +7,77 @@ use base qw/Catalyst::Controller/;
 
 sub begin :Private { }
 
+#
+#   Simple parent/child action test
+#
 sub foo  :PathPart('childof/foo')  :Captures(1) :ChildOf('/') { }
-sub foo2 :PathPart('childof/foo2') :Captures(2) :ChildOf('/') { }
-
-sub bar :PathPart('childof/bar') :ChildOf('/') { }
-
 sub endpoint  :PathPart('end')  :ChildOf('/action/childof/foo')  :Args(1) { }
+
+#
+#   Parent/child test with two args each
+#
+sub foo2 :PathPart('childof/foo2') :Captures(2) :ChildOf('/') { }
 sub endpoint2 :PathPart('end2') :ChildOf('/action/childof/foo2') :Args(2) { }
 
-sub finale :ChildOf('bar') :Args { }
+#
+#   Relative specification of parent action
+#
+sub bar :PathPart('childof/bar') :ChildOf('/') :Captures(0) { }
+sub finale :PathPart('') :ChildOf('bar') :Args { }
 
+#
+#   three chain with concurrent endpoints
+#
 sub one   :PathPart('childof/one') :ChildOf('/')                   :Captures(1) { }
 sub two   :PathPart('two')         :ChildOf('/action/childof/one') :Captures(2) { }
-
 sub three_end :PathPart('three')       :ChildOf('two') :Args(3) { }
 sub one_end   :PathPart('childof/one') :ChildOf('/')   :Args(1) { }
 sub two_end   :PathPart('two')         :ChildOf('one') :Args(2) { }
 
+#
+#   Dispatch on number of arguments
+#
 sub multi1 :PathPart('childof/multi') :ChildOf('/') :Args(1) { }
 sub multi2 :PathPart('childof/multi') :ChildOf('/') :Args(2) { }
 
+#
+#   Roots in an action defined in a higher controller
+#
+sub higher_root :PathPart('bar') :ChildOf('/action/childof/foo/higher_root') :Args(1) { }
+
+#
+#   Controller -> subcontroller -> controller
+#
+sub pcp1 :PathPart('childof/pcp1')  :ChildOf('/')                        :Captures(1) { }
+sub pcp3 :ChildOf('/action/childof/foo/pcp2') :Args(1)     { }
+
+#
+#   Dispatch on capture number
+#
+sub multi_cap1 :PathPart('childof/multi_cap') :ChildOf('/') :Captures(1) { }
+sub multi_cap2 :PathPart('childof/multi_cap') :ChildOf('/') :Captures(2) { }
+sub multi_cap_end1 :PathPart('baz') :ChildOf('multi_cap1') :Args(0) { }
+sub multi_cap_end2 :PathPart('baz') :ChildOf('multi_cap2') :Args(0) { }
+
+#
+#   Priority: Slurpy args vs. chained actions
+#
+sub priority_a1 :PathPart('childof/priority_a') :ChildOf('/') :Args { }
+sub priority_a2 :PathPart('childof/priority_a') :ChildOf('/') :Captures(1) { }
+sub priority_a2_end :PathPart('end') :ChildOf('priority_a2') :Args(1) { }
+
+#
+#   Priority: Fixed args vs. chained actions
+#
+sub priority_b1 :PathPart('childof/priority_b') :ChildOf('/') :Args(3) { }
+sub priority_b2 :PathPart('childof/priority_b') :ChildOf('/') :Captures(1) { }
+sub priority_b2_end :PathPart('end') :ChildOf('priority_b2') :Args(1) { }
+
+#
+#   Optional specification of :Args in endpoint
+#
+sub opt_args :PathPart('childof/opt_args') :ChildOf('/') { }
+
 sub end :Private {
   my ($self, $c) = @_;
   my $out = join('; ', map { join(', ', @$_) }