[Catalyst-commits] r8450 - Catalyst-Runtime/5.80/trunk/t/aggregate

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2008-09-25 23:39:44 +0100 (Thu, 25 Sep 2008)
New Revision: 8450

Modified:
   Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_controller_action_multipath.t
   Catalyst-Runtime/5.80/trunk/t/aggregate/unit_core_uri_for_action.t
Log:
Remove warnings when running aggregated tests.

Modified: Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_controller_action_multipath.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_controller_action_multipath.t	2008-09-25 22:34:41 UTC (rev 8449)
+++ Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_controller_action_multipath.t	2008-09-25 22:39:44 UTC (rev 8450)
@@ -24,11 +24,13 @@
 }
 else {
     for ( 1 .. $iters ) {
-        run_tests();
+        run_tests($content);
     }
 }
 
 sub run_tests {
+    my ($content) = @_;
+
     # Local
     {
         ok(

Modified: Catalyst-Runtime/5.80/trunk/t/aggregate/unit_core_uri_for_action.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/aggregate/unit_core_uri_for_action.t	2008-09-25 22:34:41 UTC (rev 8449)
+++ Catalyst-Runtime/5.80/trunk/t/aggregate/unit_core_uri_for_action.t	2008-09-25 22:39:44 UTC (rev 8450)
@@ -120,17 +120,17 @@
 #   More Chained with Context Tests
 #
 {
-    sub __action { $dispatcher->get_action_by_path( @_ ) }
+    sub __action { shift->get_action_by_path( @_ ) }
 
-    is( $context->uri_for( __action( '/action/chained/endpoint2' ), [1,2], (3,4), { x => 5 } ),
+    is( $context->uri_for( __action( $dispatcher, '/action/chained/endpoint2' ), [1,2], (3,4), { x => 5 } ),
         'http://127.0.0.1/foo/chained/foo2/1/2/end2/3/4?x=5',
         'uri_for correct for chained with multiple captures and args' );
 
-    is( $context->uri_for( __action( '/action/chained/three_end' ), [1,2,3], (4,5,6) ),
+    is( $context->uri_for( __action( $dispatcher, '/action/chained/three_end' ), [1,2,3], (4,5,6) ),
         'http://127.0.0.1/foo/chained/one/1/two/2/3/three/4/5/6',
         'uri_for correct for chained with multiple capturing actions' );
 
-    my $action_needs_two = __action( '/action/chained/endpoint2' );
+    my $action_needs_two = __action( $dispatcher, '/action/chained/endpoint2' );
     
     ok( ! defined( $context->uri_for($action_needs_two, [1],     (2,3)) ),
         'uri_for returns undef for not enough captures' );
@@ -162,7 +162,7 @@
         'http://127.0.0.1/foo/chained/foo2/1/2/end2/3/',
         'uri_for returns uri with empty arg on undef last argument' );
 
-    my $complex_chained = __action( '/action/chained/empty_chain_f' );
+    my $complex_chained = __action( $dispatcher, '/action/chained/empty_chain_f' );
     is( $context->uri_for( $complex_chained, [23], (13), {q => 3} ),
         'http://127.0.0.1/foo/chained/empty/23/13?q=3',
         'uri_for returns correct uri for chain with many empty path parts' );