Add option to break a chain if error occurs

[catagits/Catalyst-Runtime.git] / t / lib / TestApp / Controller / Action / Chained.pm

diff --git a/t/lib/TestApp/Controller/Action/Chained.pm b/t/lib/TestApp/Controller/Action/Chained.pm
index cffd3d6..2af1ec6 100644 (file)
--- a/t/lib/TestApp/Controller/Action/Chained.pm
+++ b/t/lib/TestApp/Controller/Action/Chained.pm
@@ -5,7 +5,7 @@ use warnings;
 
 use HTML::Entities;
 
-use base qw/Catalyst::Controller::ActionRole/;
+use base qw/Catalyst::Controller/;
 
 sub begin :Private { }
 
@@ -20,7 +20,7 @@ sub begin :Private { }
 sub foo  :PathPart('chained/foo')  :CaptureArgs(1) :Chained('/') {
     my ( $self, $c, @args ) = @_;
     die "missing argument" unless @args;
-    die "more than 1 argument" if @args > 1;
+    die "more than 1 argument: got @args" if @args > 1;
 }
 sub endpoint  :PathPart('end')  :Chained('/action/chained/foo')  :Args(1) { }
 
@@ -143,6 +143,15 @@ sub chain_dt_a :Chained :PathPart('chained/chain_dt') :CaptureArgs(1) {
 sub chain_dt_b :Chained('chain_dt_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' );
+}
+
+sub chain_die_b :Chained('chain_die_a') :PathPart('end') :Args(1) {}
+
+#
 #   Target for former forward and chain tests.
 #
 sub fw_dt_target :Private { }
@@ -220,7 +229,7 @@ sub roundtrip_urifor_end : Chained('roundtrip_urifor') PathPart('') Args(1) {
     $c->stash->{no_end} = 1;
 }
 
-sub match_captures : Chained('/') PathPart('chained/match_captures') CaptureArgs(1) Does('~TestMatchCaptures') {
+sub match_captures : Chained('/') PathPart('chained/match_captures') CaptureArgs(1) ActionClass('+TestApp::Action::TestMatchCaptures') {
     my ($self, $c) = @_;
     $c->res->header( 'X-TestAppActionTestMatchCapturesHasRan', 'yes');
 }