X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flive_component_controller_action_forward.t;h=2479fb6b17b3756a3f5f35605b6bea3f9b86ba2f;hb=26dd6d9f6575fe782e78d6845fff3447e5ba5744;hp=58d0ed4e60a9d947ea2635298046d6c3b2a5edb8;hpb=a2e038a1e9cbc0f1ea32b7087e6b47efe3af082f;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/live_component_controller_action_forward.t b/t/live_component_controller_action_forward.t
index 58d0ed4..2479fb6 100644
--- a/t/live_component_controller_action_forward.t
+++ b/t/live_component_controller_action_forward.t
@@ -8,9 +8,9 @@ use lib "$FindBin::Bin/lib";
 
 our $iters;
 
-BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
+BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 1; }
 
-use Test::More tests => 44 * $iters;
+use Test::More tests => 53 * $iters;
 use Catalyst::Test 'TestApp';
 
 if ( $ENV{CAT_BENCHMARK} ) {
@@ -148,8 +148,8 @@ sub run_tests {
     }
     {
         my @expected = qw[
-          TestApp::Controller::Action::Relative->begin
-          TestApp::Controller::Action::Relative->relative
+          TestApp::Controller::Action::TestRelative->begin
+          TestApp::Controller::Action::TestRelative->relative
           TestApp::Controller::Action::Forward->one
           TestApp::Controller::Action::Forward->two
           TestApp::Controller::Action::Forward->three
@@ -170,7 +170,7 @@ sub run_tests {
             'action/relative/relative', 'Test Action' );
         is(
             $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Relative',
+            'TestApp::Controller::Action::TestRelative',
             'Test Class'
         );
         is( $response->header('X-Catalyst-Executed'),
@@ -183,8 +183,8 @@ sub run_tests {
     }
     {
         my @expected = qw[
-          TestApp::Controller::Action::Relative->begin
-          TestApp::Controller::Action::Relative->relative_two
+          TestApp::Controller::Action::TestRelative->begin
+          TestApp::Controller::Action::TestRelative->relative_two
           TestApp::Controller::Action::Forward->one
           TestApp::Controller::Action::Forward->two
           TestApp::Controller::Action::Forward->three
@@ -211,7 +211,7 @@ sub run_tests {
         );
         is(
             $response->header('X-Test-Class'),
-            'TestApp::Controller::Action::Relative',
+            'TestApp::Controller::Action::TestRelative',
             'Test Class'
         );
         is( $response->header('X-Catalyst-Executed'),
@@ -222,4 +222,38 @@ sub run_tests {
             'Content is a serialized Catalyst::Request'
         );
     }
+
+    # test class forwards
+    {
+        ok(
+            my $response = request(
+                'http://localhost/action/forward/class_forward_test_action'),
+            'Request'
+        );
+        ok( $response->is_success, 'Response Successful 2xx' );
+        is( $response->header('X-Class-Forward-Test-Method'), 1,
+            'Test Method' );
+    }
+
+    # test uri_for re r7385
+    {
+        ok( my $response = request(
+            'http://localhost/action/forward/forward_to_uri_check'),
+            'forward_to_uri_check request');
+
+        ok( $response->is_success, 'forward_to_uri_check successful');
+        is( $response->content, '/action/forward/foo/bar',
+             'forward_to_uri_check correct namespace');
+    }
+    
+    # test forwarding to Catalyst::Action objects
+    {
+        ok( my $response = request(
+            'http://localhost/action/forward/to_action_object'),
+            'forward/to_action_object request');
+
+        ok( $response->is_success, 'forward/to_action_object successful');
+        is( $response->content, 'mtfnpy',
+             'forward/to_action_object forwards correctly');
+    }
 }