When from_psgi_response, a bug when headers are already output and charset is set...

[catagits/Catalyst-Runtime.git] / t / psgi-log.t

diff --git a/t/psgi-log.t b/t/psgi-log.t
index 2d9e2c0..91a36dc 100644 (file)
--- a/t/psgi-log.t
+++ b/t/psgi-log.t
@@ -46,8 +46,10 @@ use HTTP::Request::Common;
     no Moose;
 }
 
+my $cmp = TestApp->debug ? '>=' : '==';
 
-subtest "psgi.errors" => sub{
+#subtest "psgi.errors" => sub
+{
 
     my $handle = MockHandle->new();
     my $app = builder {
@@ -67,14 +69,15 @@ subtest "psgi.errors" => sub{
 
     test_psgi $app, sub {
         my $cb = shift;
-        my $res = $cb->(GET "/log/debug");
+        my $res = $cb->(GET "/log/info");
         my @logs = $handle->logs;
-        is(scalar(@logs), 1, "one event output");
-        like($logs[0], qr/debug$/, "event matches test data");
+        cmp_ok(scalar(@logs), $cmp, 1, "psgi.errors: one event output");
+        like($logs[0], qr/info$/m, "psgi.errors: event matches test data") unless TestApp->debug;
     };
 };
 
-subtest "psgix.logger" => sub {
+#subtest "psgix.logger" => sub
+{
 
     my @logs;
     my $logger = sub {
@@ -94,9 +97,10 @@ subtest "psgix.logger" => sub {
 
     test_psgi $app, sub {
         my $cb = shift;
-        my $res = $cb->(GET "/log/debug");
-        is(scalar(@logs), 1, "one event logged");
-        is_deeply($logs[0], { level => 'debug', message => "debug" }, "right stuff");
+        my $res = $cb->(GET "/log/info");
+        cmp_ok(scalar(@logs), $cmp, 1, "psgix.logger: one event logged");
+        is(scalar(grep { $_->{level} eq 'info' and $_->{message} eq 'info' } @logs),
+           1, "psgix.logger: right stuff");
     };
 };