cleanup

plack · Dec 3, 2013 · 7dafe51 · 7dafe51
1 parent d3fc874
commit 7dafe51
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/lib/HTTP/Message/PSGI.pm b/lib/HTTP/Message/PSGI.pm
@@ -99,15 +99,12 @@ sub res_from_psgi {
     my $res;
     if (ref $psgi_res eq 'ARRAY') {
         _res_from_psgi($psgi_res, \$res);
-    }
-    elsif (ref $psgi_res eq 'CODE') {
+    } elsif (ref $psgi_res eq 'CODE') {
         $psgi_res->(sub {
             _res_from_psgi($_[0], \$res);
         });
-    }
-    else {
-        my $response = defined $psgi_res ? "'$psgi_res'" : 'undef';
-        die "Bad response $response";
+    } else {
+        Carp::croak("Bad response: ", defined $psgi_res ? $psgi_res : 'undef');
     }
 
     return $res;

diff --git a/t/HTTP-Message-PSGI/unknown_response.t b/t/HTTP-Message-PSGI/unknown_response.t
@@ -10,11 +10,11 @@ my $app = sub { $res };
 my $env = req_to_psgi(HTTP::Request->new(GET => "http://localhost/"));
 
 eval { HTTP::Response->from_psgi($app->($env)) };
-like($@, qr/Bad response undef/, 'converting undef PSGI response results in error');
+like($@, qr/Bad response: undef/, 'converting undef PSGI response results in error');
 
 $res = 5;
 
 eval { HTTP::Response->from_psgi($app->($env)) };
-like($@, qr/Bad response '5'/, 'converting invalid PSGI response results in error');
+like($@, qr/Bad response: 5/, 'converting invalid PSGI response results in error');
 
 done_testing;