From: Matt S Trout <mst@shadowcat.co.uk>
Date: Thu, 7 Aug 2014 14:37:37 +0000 (+0000)
Subject: make dispatch_misc.t handle Plack's MockHTTP's on error behaviour changing
X-Git-Tag: v0.030~2
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FWeb-Simple.git;a=commitdiff_plain;h=e0f92e3eb7f7176e4d6cdaa4c721e3b6d40b8249

make dispatch_misc.t handle Plack's MockHTTP's on error behaviour changing
---

diff --git a/Changes b/Changes
index be269da..6d35e0b 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,7 @@
 Revision history for Web-Simple
 
+  - make dispatch_misc.t handle Plack's MockHTTP's on error behaviour changing
+
 0.029 - 2014-07-27
   - fix repository metadata (Thomas Sibley)
 
diff --git a/t/dispatch_misc.t b/t/dispatch_misc.t
index 842cf52..a4ab38a 100644
--- a/t/dispatch_misc.t
+++ b/t/dispatch_misc.t
@@ -126,12 +126,22 @@ sub invalid_psgi_responses {
     for my $response ( @responses ) {
         @dispatch = ( sub (/) { $response->[0] } );
 
-        eval { run_request( GET => 'http://localhost/' ) };
-
-        like $@, qr/Can't call method "request" on an undefined value .*MockHTTP/,
-          sprintf(
+        my $message = sprintf(
             "if a route returns %s, then that is returned as a response by WD, causing HTTP::Message::PSGI to choke",
-            $response->[1] );
+            $response->[1]
+        );
+
+        # Somewhere between 1.0028 and 1.0031 Plack changed so that the
+        # FauxObject case became a 500 rather than a die; in case it later does
+        # the same thing for other stuff, just accept either sort of error
+
+        my $res = eval { run_request( GET => 'http://localhost/' ) };
+
+        if ($res) {
+          ok $res->is_error, $message;
+        } else {
+          like $@, qr/Can't call method "request" on an undefined value .*MockHTTP/, $message;
+        }
         undef $@;
     }
 }