application proxied on context instead the other way around; not all tests pass yet

[catagits/Catalyst-Runtime.git] / t / lib / TestApp.pm

diff --git a/t/lib/TestApp.pm b/t/lib/TestApp.pm
index a2fc0b2..9d4ab50 100644 (file)
--- a/t/lib/TestApp.pm
+++ b/t/lib/TestApp.pm
@@ -4,7 +4,6 @@ use strict;
 use Catalyst qw/
     Test::MangleDollarUnderScore
     Test::Errors 
-    Test::Headers 
     Test::Plugin
     Test::Inline
     +TestApp::Plugin::FullyQualified
@@ -21,7 +20,7 @@ our $VERSION = '0.01';
 TestApp->config( name => 'TestApp', root => '/some/dir' );
 
 if (eval { Class::MOP::load_class('CatalystX::LeakChecker'); 1 }) {
-    with 'CatalystX::LeakChecker';
+#    with 'CatalystX::LeakChecker';   # LeakChecker dose not work yet with Catalyst::Context - zby
 
     has leaks => (
         is      => 'ro',
@@ -39,47 +38,84 @@ sub count_leaks {
     return scalar @{ $ctx->leaks };
 }
 
+TestApp->context_class( 'TestApp::Context' );
 TestApp->setup;
 
-sub execute {
-    my $c      = shift;
-    my $class  = ref( $c->component( $_[0] ) ) || $_[0];
-    my $action = $_[1]->reverse;
+around prepare => sub {
+    my $orig = shift;
+    my $self = shift;
 
-    my $method;
+    my $c = $self->$orig(@_);
 
-    if ( $action =~ /->(\w+)$/ ) {
-        $method = $1;
+    $c->response->header( 'X-Catalyst-Engine' => $c->engine );
+    $c->response->header( 'X-Catalyst-Debug' => $c->debug ? 1 : 0 );
+    
+    {
+        my $components = join( ', ', sort keys %{ $c->components } );
+        $c->response->header( 'X-Catalyst-Components' => $components );
     }
-    elsif ( $action =~ /\/(\w+)$/ ) {
-        $method = $1;
+
+    {
+        no strict 'refs';
+        my $plugins = join ', ', $self->registered_plugins;
+        $c->response->header( 'X-Catalyst-Plugins' => $plugins );
     }
-    elsif ( $action =~ /^(\w+)$/ ) {
-        $method = $action;
+
+    return $c;
+};
+
+
+{
+    package TestApp::Context;
+    use Moose;
+    extends 'Catalyst::Context';
+    
+    sub execute {
+        my $c      = shift;
+        my $class  = ref( $c->component( $_[0] ) ) || $_[0];
+        my $action = $_[1]->reverse;
+
+        my $method;
+
+        if ( $action =~ /->(\w+)$/ ) {
+            $method = $1;
+        }
+        elsif ( $action =~ /\/(\w+)$/ ) {
+            $method = $1;
+        }
+        elsif ( $action =~ /^(\w+)$/ ) {
+            $method = $action;
+        }
+
+        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
+            );
+        }
+        no warnings 'recursion';
+        return $c->SUPER::execute(@_);
     }
 
-    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
-        );
+    # Replace the very large HTML error page with
+    # useful info if something crashes during a test
+    sub finalize_error {
+        my $c = shift;
+        
+        $c->next::method(@_);
+        
+        $c->res->status(500);
+        $c->res->body( 'FATAL ERROR: ' . join( ', ', @{ $c->error } ) );
     }
-    no warnings 'recursion';
-    return $c->SUPER::execute(@_);
-}
 
-# Replace the very large HTML error page with
-# useful info if something crashes during a test
-sub finalize_error {
-    my $c = shift;
-    
-    $c->next::method(@_);
-    
-    $c->res->status(500);
-    $c->res->body( 'FATAL ERROR: ' . join( ', ', @{ $c->error } ) );
+    after prepare_action => sub{
+        my $c = shift;
+        $c->res->header( 'X-Catalyst-Action' => $c->req->action );
+    };
+
 }
 
 {