Dont use Catalyst::Test for handling remote apps (CATALYST_SERVER)

[catagits/Test-WWW-Mechanize-Catalyst.git] / t / multi_content_type.t

diff --git a/t/multi_content_type.t b/t/multi_content_type.t
index 5805b6d..521f463 100644 (file)
--- a/t/multi_content_type.t
+++ b/t/multi_content_type.t
@@ -10,7 +10,7 @@ BEGIN {
     $ENV{CATALYST_SERVER} ||= "http://localhost:$PORT";
 }
 
-use Test::More tests => 6;
+use Test::More tests => 8;
 use Test::Exception;
 
 BEGIN {
@@ -29,18 +29,34 @@ $SIG{INT} = sub { warn "INT:$$"; exit };
 use_ok 'ExternalCatty';
 my $pid = ExternalCatty->background($PORT);
 
-use Test::WWW::Mechanize::Catalyst 'ExternalCatty';
+use Test::WWW::Mechanize::Catalyst;
 my $m = Test::WWW::Mechanize::Catalyst->new;
 
-lives_ok { $m->get_ok( '/', 'Get a multi Content-Type response' ) }
-'Survive to a multi Content-Type sting';
+my $skip = 0;
+TRY_CONNECT: {
+  eval { $m->get('/') };
 
-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' );
+  if ($@ || $m->content =~ /Can't connect to \w+:$PORT/) {
+    $skip = $@ || $m->content;
+  }
+}
+
+SKIP: {
+  skip $skip, 7 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}/");
+}
 
 END {
-    if ( $pid > 0 ) {
+    if ( $pid && $pid != 0 ) {
         kill 9, $pid;
     }
 }