[Catalyst-commits] r8272 - in Catalyst-Runtime/5.70/trunk/t: . lib/TestApp/Controller/Action/Chained

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2008-08-24 20:31:53 +0100 (Sun, 24 Aug 2008)
New Revision: 8272

Modified:
   Catalyst-Runtime/5.70/trunk/t/lib/TestApp/Controller/Action/Chained/ParentChain.pm
   Catalyst-Runtime/5.70/trunk/t/live_component_controller_action_chained.t
Log:
Fix tests for ../action chaining.

rootdef is an endaction; the tests expect two args for chained_rel.

Modified: Catalyst-Runtime/5.70/trunk/t/lib/TestApp/Controller/Action/Chained/ParentChain.pm
===================================================================
--- Catalyst-Runtime/5.70/trunk/t/lib/TestApp/Controller/Action/Chained/ParentChain.pm	2008-08-24 19:31:44 UTC (rev 8271)
+++ Catalyst-Runtime/5.70/trunk/t/lib/TestApp/Controller/Action/Chained/ParentChain.pm	2008-08-24 19:31:53 UTC (rev 8272)
@@ -10,8 +10,8 @@
 #
 sub child :Chained('.') :Args(1) { }
 
-# Should be at /chained/rootdef/*/chained_rel
-sub chained_rel :Chained('../rootdef') Args(0) {
+# Should be at /chained/rootdef/*/chained_rel/*/*
+sub chained_rel :Chained('../one') Args(2) {
 }
 
 # Should chain to loose in parent namespace - i.e. at /chained/loose/*/loose/*/*

Modified: Catalyst-Runtime/5.70/trunk/t/live_component_controller_action_chained.t
===================================================================
--- Catalyst-Runtime/5.70/trunk/t/live_component_controller_action_chained.t	2008-08-24 19:31:44 UTC (rev 8271)
+++ Catalyst-Runtime/5.70/trunk/t/live_component_controller_action_chained.t	2008-08-24 19:31:53 UTC (rev 8272)
@@ -534,14 +534,14 @@
         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' );