X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2FTestApp%2FController%2FAction%2FChained.pm;h=2a3c7791f6704c17100924571a1558fa6f0cf599;hb=HEAD;hp=2af1ec64cbd0b114dd1a58bd7ccbec234c977296;hpb=569b665ec6e28d629c114a5fe34894ad71e8e588;p=catagits%2FCatalyst-Runtime.git diff --git a/t/lib/TestApp/Controller/Action/Chained.pm b/t/lib/TestApp/Controller/Action/Chained.pm index 2af1ec6..2a3c779 100644 --- a/t/lib/TestApp/Controller/Action/Chained.pm +++ b/t/lib/TestApp/Controller/Action/Chained.pm @@ -143,10 +143,19 @@ sub chain_dt_a :Chained :PathPart('chained/chain_dt') :CaptureArgs(1) { sub chain_dt_b :Chained('chain_dt_a') :PathPart('end') :Args(1) { } # +# Error in the middle of a chain +# +sub chain_error_a :Chained :PathPart('chained/chain_error') :CaptureArgs(1) { + $_[1]->error( 'break in the middle of a chain' ); +} + +sub chain_error_b :Chained('chain_error_a') :PathPart('end') :Args(1) {} + +# # Die in the middle of a chain # sub chain_die_a :Chained :PathPart('chained/chain_die') :CaptureArgs(1) { - $_[1]->error( 'break in the middle of a chain' ); + die( "die in the middle of a chain\n" ); } sub chain_die_b :Chained('chain_die_a') :PathPart('end') :Args(1) {} @@ -182,21 +191,21 @@ sub mult_nopp2_load : Chained('mult_nopp2_base') PathPart('') Capture sub mult_nopp2_view : Chained('mult_nopp2_load') PathPart('') Args(0) { } # -# Test Choice between branches and early return logic +# Test Choice between branches and early return logic # Declaration order is important for $children->{$*}, since this is first match best. # -sub cc_base : Chained('/') PathPart('chained/choose_capture') CaptureArgs(0) { } -sub cc_link : Chained('cc_base') PathPart('') CaptureArgs(0) { } -sub cc_anchor : Chained('cc_link') PathPart('anchor.html') Args(0) { } -sub cc_all : Chained('cc_base') PathPart('') Args() { } +sub cc_base : Chained('/') PathPart('chained/choose_capture') CaptureArgs(0) { } +sub cc_link : Chained('cc_base') PathPart('') CaptureArgs(0) { } +sub cc_anchor : Chained('cc_link') PathPart('anchor.html') Args(0) { } +sub cc_all : Chained('cc_base') PathPart('') Args() { } -sub cc_a : Chained('cc_base') PathPart('') CaptureArgs(1) { } -sub cc_a_link : Chained('cc_a') PathPart('a') CaptureArgs(0) { } -sub cc_a_anchor : Chained('cc_a_link') PathPart('') Args() { } +sub cc_a : Chained('cc_base') PathPart('') CaptureArgs(1) { } +sub cc_a_link : Chained('cc_a') PathPart('a') CaptureArgs(0) { } +sub cc_a_anchor : Chained('cc_a_link') PathPart('') Args() { } -sub cc_b : Chained('cc_base') PathPart('b') CaptureArgs(0) { } -sub cc_b_link : Chained('cc_b') PathPart('') CaptureArgs(1) { } -sub cc_b_anchor : Chained('cc_b_link') PathPart('anchor.html') Args() { } +sub cc_b : Chained('cc_base') PathPart('b') CaptureArgs(0) { } +sub cc_b_link : Chained('cc_b') PathPart('') CaptureArgs(1) { } +sub cc_b_anchor : Chained('cc_b_link') PathPart('anchor.html') Args() { } # # Test static paths vs. captures