Merge master into gsoc_breadboard

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

diff --git a/t/lib/TestApp.pm b/t/lib/TestApp.pm
index d1d8797..29060e8 100644 (file)
--- a/t/lib/TestApp.pm
+++ b/t/lib/TestApp.pm
@@ -1,18 +1,19 @@
 package TestApp;
-use strict;
+use Moose;
+
 use Catalyst qw/
     Test::MangleDollarUnderScore
-    Test::Errors 
-    Test::Headers 
+    Test::Errors
+    Test::Headers
     Test::Plugin
     Test::Inline
     +TestApp::Plugin::FullyQualified
     +TestApp::Plugin::AddDispatchTypes
     +TestApp::Role
 /;
+extends 'Catalyst';
 use Catalyst::Utils;
 
-use Moose;
 use namespace::autoclean;
 
 # -----------
@@ -112,9 +113,9 @@ sub execute {
 # 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 } ) );
 }
@@ -124,6 +125,9 @@ sub finalize_error {
     sub Catalyst::Log::error { }
 }
 
+<<<<<<< HEAD
+# Make sure we can load Inline plugins.
+=======
 # Pretend to be Plugin::Session and hook finalize_headers to send a header
 
 sub finalize_headers {
@@ -135,6 +139,7 @@ sub finalize_headers {
 }
 
 # Make sure we can load Inline plugins. 
+>>>>>>> origin/master
 
 package Catalyst::Plugin::Test::Inline;