Remove a big chunk of duplicate code from C::Test

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Test.pm

diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm
index 20bd827..9f2f7be 100644 (file)
--- a/lib/Catalyst/Test.pm
+++ b/lib/Catalyst/Test.pm
@@ -136,21 +136,29 @@ sub remote_request {
 
     if ( $server->path =~ m|^(.+)?/$| ) {
         $server->path("$1");    # need to be quoted
-        }
+    }
 
     # the request path needs to be sanitised if $server is using a
     # non-root path due to potential overlap between request path and
     # response path.
     if ($server->path) {
+        # If request path is '/', we have to add a trailing slash to the
+        # final request URI
+        my $add_trailing = $request->uri->path eq '/';
+        
         my @sp = split '/', $server->path;
         my @rp = split '/', $request->uri->path;
         shift @sp;shift @rp; # leading /
         if (@rp) {
             foreach my $sp (@sp) {
-                shift @rp if $sp eq $rp[0];
+                $sp eq $rp[0] ? shift @rp : last
             }
         }
         $request->uri->path(join '/', @rp);
+        
+        if ( $add_trailing ) {
+            $request->uri->path( $request->uri->path . '/' );
+        }
     }
 
     $request->uri->scheme( $server->scheme );