X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2FTestApp.pm;h=4b25a89553a5920c11cfdbab13757a5ac836bc1e;hb=6ac0784b4442b46abae68c76318c2189221e725d;hp=d339f6e90f954aa03465c3883f43b150f5babcbc;hpb=950c7852982926188a3e716dcb52c3e1a9510936;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/lib/TestApp.pm b/t/lib/TestApp.pm
index d339f6e..4b25a89 100644
--- a/t/lib/TestApp.pm
+++ b/t/lib/TestApp.pm
@@ -1,19 +1,19 @@
 package TestApp;
+use Moose;
 
-use strict;
 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;
 
 # -----------
@@ -42,7 +42,21 @@ has 'my_greeting_obj_lazy' => (
 
 our $VERSION = '0.01';
 
-TestApp->config( name => 'TestApp', root => '/some/dir', use_request_uri_for_path => 1 );
+TestApp->config( 
+    name => 'TestApp', 
+    root => '/some/dir', 
+    use_request_uri_for_path => 1, 
+    'Controller::Action::Action' => {
+        action_args => {
+            action_action_nine => { another_extra_arg => 13 }
+        }
+    }
+);
+
+# Test bug found when re-adjusting the metaclass compat code in Moose
+# in 292360. Test added to Moose in 4b760d6, but leave this attribute
+# above ->setup so we have some generated methods to be double sure.
+has an_attribute_before_we_change_base_classes => ( is => 'ro');
 
 if ($::setup_leakchecker && eval { Class::MOP::load_class('CatalystX::LeakChecker'); 1 }) {
     with 'CatalystX::LeakChecker';
@@ -99,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 } ) );
 }
@@ -111,7 +125,17 @@ sub finalize_error {
     sub Catalyst::Log::error { }
 }
 
-# Make sure we can load Inline plugins. 
+# Pretend to be Plugin::Session and hook finalize_headers to send a header
+
+sub finalize_headers {
+    my $c = shift;
+
+    $c->res->header('X-Test-Header', 'valid');
+
+    return $c->maybe::next::method(@_);
+}
+
+# Make sure we can load Inline plugins.
 
 package Catalyst::Plugin::Test::Inline;