X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2FTestApp.pm;h=e9e7e59c461e76cafa63198a978a219611f6e3c6;hb=c9f762d744cb30613f7804bb03733c90c1a45c0e;hp=d903b3c4a28ab3cb9b03a23c9e0270767221602f;hpb=7289922b016e36af1b5a9e656fe4b8fa776180e9;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/lib/TestApp.pm b/t/lib/TestApp.pm
index d903b3c..e9e7e59 100644
--- a/t/lib/TestApp.pm
+++ b/t/lib/TestApp.pm
@@ -2,11 +2,14 @@ package TestApp;
 
 use strict;
 use Catalyst qw/
+    Test::MangleDollarUnderScore
     Test::Errors 
     Test::Headers 
     Test::Plugin
     Test::Inline
     +TestApp::Plugin::FullyQualified
+    +TestApp::Plugin::AddDispatchTypes
+    +TestApp::Role
 /;
 use Catalyst::Utils;
 
@@ -14,10 +17,6 @@ our $VERSION = '0.01';
 
 TestApp->config( name => 'TestApp', root => '/some/dir' );
 
-unless (eval 'require Moose; 1') {
-    TestApp->config(setup_components => { except => 'TestApp::Controller::Moose' });
-}
-
 TestApp->setup;
 
 sub index : Private {
@@ -33,7 +32,7 @@ sub global_action : Private {
 sub execute {
     my $c      = shift;
     my $class  = ref( $c->component( $_[0] ) ) || $_[0];
-    my $action = "$_[1]";
+    my $action = $_[1]->reverse;
 
     my $method;
 
@@ -65,7 +64,7 @@ sub execute {
 sub finalize_error {
     my $c = shift;
     
-    $c->NEXT::finalize_error(@_);
+    $c->next::method(@_);
     
     $c->res->status(500);
     $c->res->body( 'FATAL ERROR: ' . join( ', ', @{ $c->error } ) );
@@ -76,16 +75,6 @@ sub class_forward_test_method :Private {
     $c->response->headers->header( 'X-Class-Forward-Test-Method' => 1 );
 }
 
-sub class_go_test_method :Private {
-    my ( $self, $c ) = @_;
-    $c->response->headers->header( 'X-Class-Go-Test-Method' => 1 );
-}
-
-sub class_visit_test_method :Private {
-    my ( $self, $c ) = @_;
-    $c->response->headers->header( 'X-Class-Visit-Test-Method' => 1 );
-}
-
 sub loop_test : Local {
     my ( $self, $c ) = @_;
 
@@ -110,6 +99,6 @@ package Catalyst::Plugin::Test::Inline;
 
 use strict;
 
-use base qw/Catalyst::Base Class::Data::Inheritable/;
+use base qw/Class::Data::Inheritable/;
 
 1;