X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2FTestApp.pm;h=8630a98757c0afe948ec8f77ccbe4eb9c6ac83fb;hb=86d993abfe04d54984bca9c1c5a91139ec1eec42;hp=acb4a646ecfb1bad0015aab49b0a37512bd0db66;hpb=4d989a5da1809be1088a985e02dff19f89b8cfd6;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/lib/TestApp.pm b/t/lib/TestApp.pm
index acb4a64..8630a98 100644
--- a/t/lib/TestApp.pm
+++ b/t/lib/TestApp.pm
@@ -1,18 +1,19 @@
 package TestApp;
 
 use strict;
-use Catalyst qw[Test::Errors Test::Headers];
+use Catalyst qw/Test::Errors Test::Headers Test::Plugin/;
+use Catalyst::Utils;
 
 our $VERSION = '0.01';
 
-TestApp->config(
-    name => 'TestApp',
-    root => '/Users/chansen/src/MyApp/root',
-);
+TestApp->config( name => 'TestApp', root => '/some/dir' );
 
 TestApp->setup;
 
-#sub execute { return shift->NEXT::execute(@_); } # does not work, bug?
+sub index : Private {
+    my ( $self, $c ) = @_;
+    $c->res->body('root index');
+}
 
 sub global_action : Private {
     my ( $self, $c ) = @_;
@@ -22,7 +23,7 @@ sub global_action : Private {
 sub execute {
     my $c      = shift;
     my $class  = ref( $c->component( $_[0] ) ) || $_[0];
-    my $action = $c->actions->{reverse}->{"$_[1]"} || "$_[1]";
+    my $action = "$_[1]";
 
     my $method;
 
@@ -32,12 +33,30 @@ sub execute {
     elsif ( $action =~ /\/(\w+)$/ ) {
         $method = $1;
     }
+    elsif ( $action =~ /^(\w+)$/ ) {
+        $method = $action;
+    }
 
-    my $executed = sprintf( "%s->%s", $class, $method )
-      if ( $class && $method );
+    if ( $class && $method && $method !~ /^_/ ) {
+        my $executed = sprintf( "%s->%s", $class, $method );
+        my @executed = $c->response->headers->header('X-Catalyst-Executed');
+        push @executed, $executed;
+        $c->response->headers->header(
+            'X-Catalyst-Executed' => join ', ',
+            @executed
+        );
+    }
 
-    $c->response->headers->push_header( 'X-Catalyst-Executed' => $executed );
     return $c->SUPER::execute(@_);
 }
 
+sub class_forward_test_method {
+    my ( $self, $c ) = @_;
+    $c->response->headers->header( 'X-Class-Forward-Test-Method' => 1 );
+}
+
+{
+    no warnings 'redefine';
+    sub Catalyst::Log::error { }
+}
 1;