X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fmulti_content_type.t;h=097dce9ed0072c0fea513268efd685ed04a7ada1;hb=71896b6e2ad0faf686bfab695a70b89ef15aac4f;hp=71ac22880583a2c07167be5ee5571109fbadc34b;hpb=025eaf4a0fd262799c7940e5b65ab58b22435121;p=catagits%2FTest-WWW-Mechanize-Catalyst.git

diff --git a/t/multi_content_type.t b/t/multi_content_type.t
index 71ac228..097dce9 100644
--- a/t/multi_content_type.t
+++ b/t/multi_content_type.t
@@ -7,10 +7,9 @@ my $PORT;
 
 BEGIN {
     $PORT = $ENV{TWMC_TEST_PORT} || 7357;
-    $ENV{CATALYST_SERVER} ||= "http://localhost:$PORT";
 }
 
-use Test::More tests => 6;
+use Test::More;
 use Test::Exception;
 
 BEGIN {
@@ -27,28 +26,42 @@ BEGIN {
 $SIG{INT} = sub { warn "INT:$$"; exit };
 
 use_ok 'ExternalCatty';
-my $pid = ExternalCatty->background($PORT);
+my $pid;
+($pid, $PORT) = ExternalCatty->background($PORT);
+$ENV{CATALYST_SERVER} ||= "http://localhost:$PORT";
 
 use Test::WWW::Mechanize::Catalyst;
 my $m = Test::WWW::Mechanize::Catalyst->new;
 
+# Yeah, sorry - wait for the forked process to spin up...
+sleep 10;
+
 my $skip = 0;
 TRY_CONNECT: {
   eval { $m->get('/') };
 
-  if ($@ || $m->content =~ /Can't connect to localhost:$PORT/) {
+  if ($@ || $m->content =~ /Can't connect to \w+:$PORT/) {
     $skip = $@ || $m->content;
+    diag $m;
   }
 }
 
 SKIP: {
-  skip $skip, 5 if $skip;
+  skip $skip, 9 if $skip;
   lives_ok { $m->get_ok( '/', 'Get a multi Content-Type response' ) }
   'Survive to a multi Content-Type sting';
 
   is( $m->ct, 'text/html', 'Multi Content-Type Content-Type' );
   $m->title_is( 'Root', 'Multi Content-Type title' );
   $m->content_contains( "Hello, test \x{263A}!", 'Multi Content-Type body' );
+
+  # Test a redirect with a remote server now too.
+  $m->get_ok( '/hello' );
+  is($m->uri, "$ENV{CATALYST_SERVER}/");
+
+  $m->get_ok( '/host' );
+  $m->content_contains('Host: localhost:$PORT') or diag $m->content;
+
 }
 
 END {
@@ -57,5 +70,7 @@ END {
     }
 }
 
+done_testing;
+
 1;