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 ) = @_;
}
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(@_);
}
+{
+ no warnings 'redefine';
+ sub Catalyst::Log::error { }
+}
1;