X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Flib%2FTestContentNegotiation%2FController%2FRoot.pm;fp=t%2Flib%2FTestContentNegotiation%2FController%2FRoot.pm;h=60fe6f753820ac99c4ca82329443588b2ab84003;hp=ab8e0eb7c291c18110c3680733f323e441d81617;hb=32d4a56f5768c84faa69b3c6a7edf959f5fe0d17;hpb=d15db19cbcfd1896251aa7704907fb76b552beb7

diff --git a/t/lib/TestContentNegotiation/Controller/Root.pm b/t/lib/TestContentNegotiation/Controller/Root.pm
index ab8e0eb..60fe6f7 100644
--- a/t/lib/TestContentNegotiation/Controller/Root.pm
+++ b/t/lib/TestContentNegotiation/Controller/Root.pm
@@ -7,22 +7,22 @@ extends 'Catalyst::Controller';
 
 sub start :Chained(/) PathPrefix CaptureArgs(0) { }
 
-    sub is_json       : Chained('start') PathPart('') Consumes('application/json') Args(0) { pop->res->body('is_json') }
-    sub is_urlencoded : Chained('start') PathPart('') Consumes('application/x-www-form-urlencoded') Args(0) { pop->res->body('is_urlencoded') }
-    sub is_multipart  : Chained('start') PathPart('') Consumes('multipart/form-data') Args(0) { pop->res->body('is_multipart') }
+    sub is_json       : Chained('start') PathPart('') Consumes('application/json') Args(0) { pop->res->body('is_json1') }
+    sub is_urlencoded : Chained('start') PathPart('') Consumes('application/x-www-form-urlencoded') Args(0) { pop->res->body('is_urlencoded1') }
+    sub is_multipart  : Chained('start') PathPart('') Consumes('multipart/form-data') Args(0) { pop->res->body('is_multipart1') }
       
     sub under :Chained('start') CaptureArgs(0) { }
 
-      sub is_json_under       : Chained('under') PathPart('') Consumes(JSON) Args(0) { pop->res->body('is_json') }
-      sub is_urlencoded_under : Chained('under') PathPart('') Consumes(UrlEncoded) Args(0) { pop->res->body('is_urlencoded') }
-      sub is_multipart_under  : Chained('under') PathPart('') Consumes(Multipart) Args(0) { pop->res->body('is_multipart') }
+      sub is_json_under       : Chained('under') PathPart('') Consumes(JSON) Args(0) { pop->res->body('is_json2') }
+      sub is_urlencoded_under : Chained('under') PathPart('') Consumes(UrlEncoded) Args(0) { pop->res->body('is_urlencoded2') }
+      sub is_multipart_under  : Chained('under') PathPart('') Consumes(Multipart) Args(0) { pop->res->body('is_multipart2') }
 
       ## Or allow more than one type
     
-    sub multi :Chained('start') CaptureArgs(0) { }
+    sub multi :Chained('start') PathPart('') CaptureArgs(0) { }
       
     sub is_more_than_one_1
-      : Chained('multi') PathPart('')
+      : Chained('multi') 
       : Consumes('application/x-www-form-urlencoded')
       : Consumes('multipart/form-data')
       : Args(0)
@@ -31,7 +31,7 @@ sub start :Chained(/) PathPrefix CaptureArgs(0) { }
     }
 
     sub is_more_than_one_2
-      : Chained('multi') PathPart('')
+      : Chained('multi') 
       : Consumes('HTMLForm')
       : Args(0)
     {
@@ -39,7 +39,7 @@ sub start :Chained(/) PathPrefix CaptureArgs(0) { }
     }
 
     sub is_more_than_one_3
-      : Chained('multi') PathPart('')
+      : Chained('multi') 
       : Consumes('application/x-www-form-urlencoded,multipart/form-data')
       : Args(0)
     {