execute is now in Context - fixing test libs (for example test t/aggregate/live_compo...

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

diff --git a/t/lib/TestApp.pm b/t/lib/TestApp.pm
index 321f78e..50238af 100644 (file)
--- a/t/lib/TestApp.pm
+++ b/t/lib/TestApp.pm
@@ -12,6 +12,7 @@ use Catalyst qw/
     +TestApp::Role
 /;
 use Catalyst::Utils;
+use TestApp::Context;
 
 use Moose;
 use namespace::autoclean;
@@ -20,67 +21,9 @@ our $VERSION = '0.01';
 
 TestApp->config( name => 'TestApp', root => '/some/dir' );
 
-if (eval { Class::MOP::load_class('CatalystX::LeakChecker'); 1 }) {
-    with 'CatalystX::LeakChecker';
-
-    has leaks => (
-        is      => 'ro',
-        default => sub { [] },
-    );
-}
-
-sub found_leaks {
-    my ($ctx, @leaks) = @_;
-    push @{ $ctx->leaks }, @leaks;
-}
-
-sub count_leaks {
-    my ($ctx) = @_;
-    return scalar @{ $ctx->leaks };
-}
-
+TestApp->context_class( 'TestApp::Context' );
 TestApp->setup;
 
-sub index : Private {
-    my ( $self, $c ) = @_;
-    $c->res->body('root index');
-}
-
-sub global_action : Private {
-    my ( $self, $c ) = @_;
-    $c->forward('TestApp::View::Dump::Request');
-}
-
-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(@_);
-}
-
 # Replace the very large HTML error page with
 # useful info if something crashes during a test
 sub finalize_error {
@@ -92,25 +35,6 @@ sub finalize_error {
     $c->res->body( 'FATAL ERROR: ' . join( ', ', @{ $c->error } ) );
 }
 
-sub class_forward_test_method :Private {
-    my ( $self, $c ) = @_;
-    $c->response->headers->header( 'X-Class-Forward-Test-Method' => 1 );
-}
-
-sub loop_test : Local {
-    my ( $self, $c ) = @_;
-
-    for( 1..1001 ) {
-        $c->forward( 'class_forward_test_method' );
-    }
-}
-
-sub recursion_test : Local {
-    my ( $self, $c ) = @_;
-    no warnings 'recursion';
-    $c->forward( 'recursion_test' );
-}
-
 {
     no warnings 'redefine';
     sub Catalyst::Log::error { }