Small whitespace and test cleanups

diff --git a/t/aggregate/live_component_controller_action_auto.t b/t/aggregate/live_component_controller_action_auto.t
index 01bdfe4..853bb8f 100644 (file)
--- a/t/aggregate/live_component_controller_action_auto.t
+++ b/t/aggregate/live_component_controller_action_auto.t
@@ -10,13 +10,13 @@ our $iters;
 
 BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 1; }
 
-use Test::More tests => 27*$iters;
+use Test::More;
 use Catalyst::Test 'TestApp';
 
 if ( $ENV{CAT_BENCHMARK} ) {
     require Benchmark;
     Benchmark::timethis( $iters, \&run_tests );
-    
+
     # new dispatcher:
     # 11 wallclock secs (10.14 usr +  0.20 sys = 10.34 CPU) @ 15.18/s (n=157)
     # old dispatcher (r1486):
@@ -27,7 +27,7 @@ else {
         run_tests();
     }
 }
-    
+
 sub run_tests {
     # test auto + local method
     {
@@ -37,15 +37,15 @@ sub run_tests {
           TestApp::Controller::Action::Auto->one
           TestApp::Controller::Root->end
         ];
-    
+
         my $expected = join( ", ", @expected );
-    
+
         ok( my $response = request('http://localhost/action/auto/one'), 'auto + local' );
         is( $response->header('X-Catalyst-Executed'),
             $expected, 'Executed actions' );
         is( $response->content, 'one', 'Content OK' );
     }
-    
+
     # test auto + default
     {
         my @expected = qw[
@@ -54,15 +54,15 @@ sub run_tests {
           TestApp::Controller::Action::Auto->default
           TestApp::Controller::Root->end
         ];
-    
+
         my $expected = join( ", ", @expected );
-    
+
         ok( my $response = request('http://localhost/action/auto/anything'), 'auto + default' );
         is( $response->header('X-Catalyst-Executed'),
             $expected, 'Executed actions' );
         is( $response->content, 'default', 'Content OK' );
     }
-    
+
     # test auto + auto + local
     {
         my @expected = qw[
@@ -72,15 +72,15 @@ sub run_tests {
           TestApp::Controller::Action::Auto::Deep->one
           TestApp::Controller::Root->end
         ];
-    
+
         my $expected = join( ", ", @expected );
-    
+
         ok( my $response = request('http://localhost/action/auto/deep/one'), 'auto + auto + local' );
         is( $response->header('X-Catalyst-Executed'),
             $expected, 'Executed actions' );
         is( $response->content, 'deep one', 'Content OK' );
     }
-    
+
     # test auto + auto + default
     {
         my @expected = qw[
@@ -90,15 +90,15 @@ sub run_tests {
           TestApp::Controller::Action::Auto::Deep->default
           TestApp::Controller::Root->end
         ];
-    
+
         my $expected = join( ", ", @expected );
-    
+
         ok( my $response = request('http://localhost/action/auto/deep/anything'), 'auto + auto + default' );
         is( $response->header('X-Catalyst-Executed'),
             $expected, 'Executed actions' );
         is( $response->content, 'deep default', 'Content OK' );
     }
-    
+
     # test auto + failing auto + local + end
     {
         my @expected = qw[
@@ -107,15 +107,15 @@ sub run_tests {
           TestApp::Controller::Action::Auto::Abort->auto
           TestApp::Controller::Action::Auto::Abort->end
         ];
-    
+
         my $expected = join( ", ", @expected );
-    
+
         ok( my $response = request('http://localhost/action/auto/abort/one'), 'auto + failing auto + local' );
         is( $response->header('X-Catalyst-Executed'),
             $expected, 'Executed actions' );
         is( $response->content, 'abort end', 'Content OK' );
     }
-    
+
     # test auto + default (bug on invocation of default twice)
     {
         my @expected = qw[
@@ -125,9 +125,9 @@ sub run_tests {
           TestApp::Controller::Action::Auto::Default->default
           TestApp::Controller::Action::Auto::Default->end
         ];
-    
+
         my $expected = join( ", ", @expected );
-    
+
         ok( my $response = request('http://localhost/action/auto/default/moose'), 'auto + default' );
         is( $response->header('X-Catalyst-Executed'),
             $expected, 'Executed actions' );
@@ -142,9 +142,9 @@ sub run_tests {
           TestApp::Controller::Action::Auto::Detach->auto
           TestApp::Controller::Root->end
         ];
-    
+
         my $expected = join( ", ", @expected );
-    
+
         ok( my $response = request('http://localhost/action/auto/detach'), 'auto with detach' );
         is( $response->header('X-Catalyst-Executed'),
             $expected, 'Executed actions' );
@@ -160,9 +160,9 @@ sub run_tests {
           TestApp::Controller::Action::Auto::Detach->with_forward_detach
           TestApp::Controller::Root->end
         ];
-    
+
         my $expected = join( ", ", @expected );
-    
+
         ok( my $response = request('http://localhost/action/auto/detach?with_forward_detach=1'), 'auto with_forward_detach' );
         is( $response->header('X-Catalyst-Executed'),
             $expected, 'Executed actions' );
@@ -179,12 +179,15 @@ sub run_tests {
           TestApp::Controller::Action::Auto::Detach->detach_action
           TestApp::Controller::Root->end
         ];
-    
+
         my $expected = join( ", ", @expected );
-    
+
         ok( my $response = request('http://localhost/action/auto/detach?with_forward_detach=1&detach_to_action=1'), 'auto with_forward_detach to detach_action' );
         is( $response->header('X-Catalyst-Executed'),
             $expected, 'Executed actions' );
         is( $response->content, 'detach_action', 'Content OK' );
     }
 }
+
+done_testing;
+

diff --git a/t/live_catalyst_test.t b/t/live_catalyst_test.t
index c37372a..326afc0 100644 (file)
--- a/t/live_catalyst_test.t
+++ b/t/live_catalyst_test.t
@@ -3,7 +3,7 @@ use lib "$FindBin::Bin/lib";
 use Catalyst::Test 'TestApp', {default_host => 'default.com'};
 use Catalyst::Request;
 
-use Test::More tests => 10;
+use Test::More;
 
 content_like('/',qr/root/,'content check');
 action_ok('/','Action ok ok','normal action ok');
@@ -40,3 +40,6 @@ my $req = '/dump/request';
     eval '$creq = ' . request($req, \%opts)->content;
     is( $creq->uri->host, $opts{host}, 'target host is mutable via options hashref' );
 }
+
+done_testing;
+