X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flive_component_controller_action_chained.t;h=a8b7e09ab97f0246ae7ea3f82400e68093379c51;hb=f04fdedae056296d0fa97fbdcaa85b9811ca6a5b;hp=e2fed7dc2a68daa670b226e9faf6138c5c471598;hpb=69e7f14788b27841bc9573491b5afc7e2dc9a351;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/live_component_controller_action_chained.t b/t/live_component_controller_action_chained.t
index e2fed7d..a8b7e09 100644
--- a/t/live_component_controller_action_chained.t
+++ b/t/live_component_controller_action_chained.t
@@ -10,7 +10,7 @@ our $iters;
 
 BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 1; }
 
-use Test::More tests => 138*$iters;
+use Test::More tests => 141*$iters;
 use Catalyst::Test 'TestApp';
 
 if ( $ENV{CAT_BENCHMARK} ) {
@@ -531,17 +531,16 @@ sub run_tests {
     #   Test if :Chained('../act') is working
     #
     {
-        local $TODO = "To Be Coded";
         my @expected = qw[
           TestApp::Controller::Action::Chained->begin
-          TestApp::Controller::Action::Chained->rootdef
+          TestApp::Controller::Action::Chained->one
           TestApp::Controller::Action::Chained::ParentChain->chained_rel
           TestApp::Controller::Action::Chained->end
         ];
 
         my $expected = join( ", ", @expected );
 
-        ok( my $response = request('http://localhost/chained/rootdef/1/chained_rel/3/2'),
+        ok( my $response = request('http://localhost/chained/one/1/chained_rel/3/2'),
             ":Chained('../action') chains to correct action" );
         is( $response->header('X-Catalyst-Executed'),
             $expected, 'Executed actions' );
@@ -549,10 +548,29 @@ sub run_tests {
     }
 
     #
+    #   Test if ../ works to go up more than one level
+    #
+    {
+        my @expected = qw[
+            TestApp::Controller::Action::Chained->begin
+            TestApp::Controller::Action::Chained->one
+            TestApp::Controller::Action::Chained::ParentChain::Relative->chained_rel_two
+            TestApp::Controller::Action::Chained->end
+        ];
+
+        my $expected = join( ", ", @expected );
+
+        ok( my $response = request('http://localhost/chained/one/1/chained_rel_two/42/23'),
+            "../ works to go up more than one level" );
+        is( $response->header('X-Catalyst-Executed'),
+            $expected, 'Executed actions' );
+        is( $response->content, '1; 42, 23', 'Content OK' );
+    }
+
+    #
     #   Test if :ChainedParent is working
     #
     {
-        local $TODO = "To Be Coded";
         my @expected = qw[
           TestApp::Controller::Action::Chained->begin
           TestApp::Controller::Action::Chained->loose
@@ -573,7 +591,6 @@ sub run_tests {
     #   Test if :Chained('../name/act') is working
     #
     {
-        local $TODO = "To Be Coded";
         my @expected = qw[
           TestApp::Controller::Action::Chained->begin
           TestApp::Controller::Action::Chained::Bar->cross1