Fix regression for relative uri_for arguments after a forward() introduced in 5.7013...

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

diff --git a/t/lib/TestApp/Controller/Action/Forward.pm b/t/lib/TestApp/Controller/Action/Forward.pm
index 4fdf5ea..e118d73 100644 (file)
--- a/t/lib/TestApp/Controller/Action/Forward.pm
+++ b/t/lib/TestApp/Controller/Action/Forward.pm
@@ -15,7 +15,7 @@ sub two : Private {
 
 sub three : Local {
     my ( $self, $c ) = @_;
-    $c->forward('four');
+    $c->forward( $self, 'four' );
 }
 
 sub four : Private {
@@ -25,17 +25,15 @@ sub four : Private {
 
 sub five : Local {
     my ( $self, $c ) = @_;
-    $c->forward('TestApp::View::Dump::Request');
+    $c->forward('View::Dump::Request');
 }
 
-
 sub jojo : Local {
     my ( $self, $c ) = @_;
     $c->forward('one');
-    $c->forward('three');
+    $c->forward( $c->controller('Action::Forward'), 'three' );
 }
 
-
 sub inheritance : Local {
     my ( $self, $c ) = @_;
     $c->forward('/action/inheritance/a/b/default');
@@ -44,12 +42,12 @@ sub inheritance : Local {
 
 sub global : Local {
     my ( $self, $c ) = @_;
-    $c->forward( '/global_action' );
+    $c->forward('/global_action');
 }
 
 sub with_args : Local {
     my ( $self, $c, $orig ) = @_;
-    $c->forward( 'args',[qq/new/] );
+    $c->forward( 'args', [qq/new/] );
     $c->res->body( $c->req->args->[0] );
 }
 
@@ -65,4 +63,31 @@ sub args : Local {
     die "passed argument does not match args" unless $val eq $c->req->args->[0];
 }
 
+sub args_embed_relative : Local {
+    my ( $self, $c ) = @_;
+    $c->forward('embed/ok');
+}
+
+sub args_embed_absolute : Local {
+    my ( $self, $c ) = @_;
+    $c->forward('/action/forward/embed/ok');
+}
+
+sub embed : Local {
+    my ( $self, $c, $ok ) = @_;
+
+    $ok ||= 'not ok';
+    $c->res->body($ok);
+}
+
+sub class_forward_test_action : Local {
+    my ( $self, $c ) = @_;
+    $c->forward(qw/TestApp class_forward_test_method/);
+}
+
+sub forward_to_uri_check : Local {
+    my ( $self, $c ) = @_;
+    $c->forward( 'Action::ForwardTo', 'uri_check' );
+}
+
 1;