X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Flib%2FTestApp.pm;h=00cde9a475994676036cbda6542fd9d2564df6b8;hp=2e9483eb073260b97684e33ca67f7545293c220c;hb=836e1134dfc70e064464c366a44ebb6aabfa1648;hpb=e5d7f18ca33ac9a5df3e22a5d7161a4a3b2cce36

diff --git a/t/lib/TestApp.pm b/t/lib/TestApp.pm
index 2e9483e..00cde9a 100644
--- a/t/lib/TestApp.pm
+++ b/t/lib/TestApp.pm
@@ -1,18 +1,24 @@
 package TestApp;
 
 use strict;
-use Catalyst qw[Test::Errors Test::Headers];
+use Catalyst qw/
+    Test::Errors 
+    Test::Headers 
+    Test::Plugin
+    +TestApp::Plugin::FullyQualified
+/;
+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 ) = @_;
@@ -20,23 +26,42 @@ sub global_action : Private {
 }
 
 sub execute {
-    my $c       = shift;
-    my $class   = ref( $c->component($_[0]) ) || $_[0];
-    my $action  = $c->actions->{reverse}->{"$_[1]"} || "$_[1]";
+    my $c      = shift;
+    my $class  = ref( $c->component( $_[0] ) ) || $_[0];
+    my $action = "$_[1]";
 
     my $method;
 
-    if ( $action =~ /->(\w+)$/ ) { 
-        $method = $1; 
+    if ( $action =~ /->(\w+)$/ ) {
+        $method = $1;
     }
-    elsif ( $action =~ /\/(\w+)$/ ) { 
-        $method = $1; 
+    elsif ( $action =~ /\/(\w+)$/ ) {
+        $method = $1;
+    }
+    elsif ( $action =~ /^(\w+)$/ ) {
+        $method = $action;
     }
 
-    my $executed = sprintf( "%s->%s", $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;