setup_home tests

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

diff --git a/t/lib/TestApp.pm b/t/lib/TestApp.pm
index 29060e8..8baa786 100644 (file)
--- a/t/lib/TestApp.pm
+++ b/t/lib/TestApp.pm
@@ -125,9 +125,6 @@ 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,11 +132,15 @@ sub finalize_headers {
 
     $c->res->header('X-Test-Header', 'valid');
 
+    my $call_count = $c->stash->{finalize_headers_call_count} || 0;
+    $call_count++;
+    $c->stash(finalize_headers_call_count => $call_count);
+    $c->res->header('X-Test-Header-Call-Count' => $call_count);
+
     return $c->maybe::next::method(@_);
 }
 
-# Make sure we can load Inline plugins. 
->>>>>>> origin/master
+# Make sure we can load Inline plugins.
 
 package Catalyst::Plugin::Test::Inline;