X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flive_component_controller_action_auto.t;h=bd3530634b594ead7cf59ac0e4a2cd8b7470e991;hb=c7ded7aaf69e506924a5406349fd665c7717acb8;hp=f99d4addf62b066ffbd96aa520375c9e6a16ddcf;hpb=50cc3183118f1056427ab314b84b91fd0d9e1383;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/live_component_controller_action_auto.t b/t/live_component_controller_action_auto.t
index f99d4ad..bd35306 100644
--- a/t/live_component_controller_action_auto.t
+++ b/t/live_component_controller_action_auto.t
@@ -4,11 +4,11 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/../../../lib";
+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 => 18*$iters;
 use Catalyst::Test 'TestApp';
@@ -35,7 +35,7 @@ sub run_tests {
           TestApp::Controller::Action::Auto->begin
           TestApp::Controller::Action::Auto->auto
           TestApp::Controller::Action::Auto->one
-	  TestApp->end
+          TestApp->end
         ];
     
         my $expected = join( ", ", @expected );
@@ -52,7 +52,7 @@ sub run_tests {
           TestApp::Controller::Action::Auto->begin
           TestApp::Controller::Action::Auto->auto
           TestApp::Controller::Action::Auto->default
-	  TestApp->end
+          TestApp->end
         ];
     
         my $expected = join( ", ", @expected );
@@ -70,7 +70,7 @@ sub run_tests {
           TestApp::Controller::Action::Auto->auto
           TestApp::Controller::Action::Auto::Deep->auto
           TestApp::Controller::Action::Auto::Deep->one
-	  TestApp->end
+          TestApp->end
         ];
     
         my $expected = join( ", ", @expected );
@@ -88,7 +88,7 @@ sub run_tests {
           TestApp::Controller::Action::Auto->auto
           TestApp::Controller::Action::Auto::Deep->auto
           TestApp::Controller::Action::Auto::Deep->default
-	  TestApp->end
+          TestApp->end
         ];
     
         my $expected = join( ", ", @expected );
@@ -116,20 +116,21 @@ sub run_tests {
         is( $response->content, 'abort end', 'Content OK' );
     }
     
-    # test auto + failing auto + default + end
+    # test auto + default (bug on invocation of default twice)
     {
         my @expected = qw[
-          TestApp::Controller::Action::Auto::Abort->begin
+          TestApp::Controller::Action::Auto::Default->begin
           TestApp::Controller::Action::Auto->auto
-          TestApp::Controller::Action::Auto::Abort->auto
-          TestApp::Controller::Action::Auto::Abort->end
+          TestApp::Controller::Action::Auto::Default->auto
+          TestApp::Controller::Action::Auto::Default->default
+          TestApp::Controller::Action::Auto::Default->end
         ];
     
         my $expected = join( ", ", @expected );
     
-        ok( my $response = request('http://localhost/action/auto/abort/anything'), 'auto + failing auto + default' );
+        ok( my $response = request('http://localhost/action/auto/default/moose'), 'auto + default' );
         is( $response->header('X-Catalyst-Executed'),
             $expected, 'Executed actions' );
-        is( $response->content, 'abort end', 'Content OK' );
+        is( $response->content, 'default (auto: 1)', 'Content OK' );
     }
 }