X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2FTestApp%2FController%2FPriorities.pm;h=b9daa8899d3a5eaa9b8d45df391669e5537589ce;hb=6561feaea6cb3f0a84e97fc6f2bc55788fe8c393;hp=ec98d5bac7a7ad86378795fba0ab4f0359354129;hpb=6ea96b03dee1a599ee970ae23b84fd2757a5b3da;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/lib/TestApp/Controller/Priorities.pm b/t/lib/TestApp/Controller/Priorities.pm
index ec98d5b..b9daa88 100644
--- a/t/lib/TestApp/Controller/Priorities.pm
+++ b/t/lib/TestApp/Controller/Priorities.pm
@@ -1,35 +1,7 @@
 package TestApp::Controller::Priorities;
 
 use strict;
-use base 'Catalyst::Base';
-
-#
-#   Regex vs. Local
-#
-
-sub re_vs_loc_re :Regex('/priorities/re_vs_loc') { $_[1]->res->body( 'regex' ) }
-sub re_vs_loc    :Local                          { $_[1]->res->body( 'local' ) }
-
-#
-#   Regex vs. LocalRegex
-#
-
-sub re_vs_locre_locre :LocalRegex('re_vs_(locre)')      { $_[1]->res->body( 'local_regex' ) }
-sub re_vs_locre_re    :Regex('/priorities/re_vs_locre') { $_[1]->res->body( 'regex' ) }
-
-#
-#   Regex vs. Path
-#
-
-sub re_vs_path_path :Path('/priorities/re_vs_path')  { $_[1]->res->body( 'path' ) }
-sub re_vs_path_re   :Regex('/priorities/re_vs_path') { $_[1]->res->body( 'regex' ) }
-
-#
-#   Local vs. LocalRegex
-#
-
-sub loc_vs_locre_locre :LocalRegex('loc_vs_locre') { $_[1]->res->body( 'local_regex' ) }
-sub loc_vs_locre       :Local                      { $_[1]->res->body( 'local' ) }
+use base 'Catalyst::Controller';
 
 #
 #   Local vs. Path (depends on definition order)
@@ -42,31 +14,12 @@ sub loc_vs_path2     :Local                            { $_[1]->res->body( 'loca
 sub loc_vs_path2_loc :Path('/priorities/loc_vs_path2') { $_[1]->res->body( 'path' ) }
 
 #
-#   Path vs. LocalRegex
-#
-
-sub path_vs_locre_locre :LocalRegex('path_vs_(locre)')     { $_[1]->res->body( 'local_regex' ) }
-sub path_vs_locre_path  :Path('/priorities/path_vs_locre') { $_[1]->res->body( 'path' ) }
-
-#
-#   Regex vs. index (has sub controller)
-#
-
-sub re_vs_idx :Regex('/priorities/re_vs_index') { $_[1]->res->body( 'regex' ) }
-
-#
 #   Local vs. index (has sub controller)
 #
 
 sub loc_vs_index :Local { $_[1]->res->body( 'local' ) }
 
 #
-#   LocalRegex vs. index (has sub controller)
-#
-
-sub locre_vs_idx :LocalRegex('locre_vs_index') { $_[1]->res->body( 'local_regex' ) }
-
-#
 #   Path vs. index (has sub controller)
 #