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 2e9483e..50238af 100644 (file)
--- a/t/lib/TestApp.pm
+++ b/t/lib/TestApp.pm
@@ -1,42 +1,51 @@
 package TestApp;
 
 use strict;
-use Catalyst qw[Test::Errors Test::Headers];
+use Catalyst qw/
+    Test::MangleDollarUnderScore
+    Test::Errors 
+    Test::Headers 
+    Test::Plugin
+    Test::Inline
+    +TestApp::Plugin::FullyQualified
+    +TestApp::Plugin::AddDispatchTypes
+    +TestApp::Role
+/;
+use Catalyst::Utils;
+use TestApp::Context;
+
+use Moose;
+use namespace::autoclean;
 
 our $VERSION = '0.01';
 
-TestApp->config(
-    name => 'TestApp',
-    root => '/Users/chansen/src/MyApp/root',
-);
+TestApp->config( name => 'TestApp', root => '/some/dir' );
 
+TestApp->context_class( 'TestApp::Context' );
 TestApp->setup;
 
-#sub execute { return shift->NEXT::execute(@_); } # does not work, bug?
-
-sub global_action : Private {
-    my ( $self, $c ) = @_;
-    $c->forward('TestApp::View::Dump::Request');
+# 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 } ) );
 }
 
-sub execute {
-    my $c       = shift;
-    my $class   = ref( $c->component($_[0]) ) || $_[0];
-    my $action  = $c->actions->{reverse}->{"$_[1]"} || "$_[1]";
+{
+    no warnings 'redefine';
+    sub Catalyst::Log::error { }
+}
 
-    my $method;
+# Make sure we can load Inline plugins. 
 
-    if ( $action =~ /->(\w+)$/ ) { 
-        $method = $1; 
-    }
-    elsif ( $action =~ /\/(\w+)$/ ) { 
-        $method = $1; 
-    }
+package Catalyst::Plugin::Test::Inline;
 
-    my $executed = sprintf( "%s->%s", $class, $method );
+use strict;
 
-    $c->response->headers->push_header( 'X-Catalyst-Executed' => $executed );
-    return $c->SUPER::execute(@_);
-}
+use base qw/Class::Data::Inheritable/;
 
 1;