Use mod_rewrite in the non-root lighttpd test to workaround the trailing slash issue

[catagits/Catalyst-Runtime.git] / t / optional_lighttpd-fastcgi-non-root.t

diff --git a/t/optional_lighttpd-fastcgi-non-root.t b/t/optional_lighttpd-fastcgi-non-root.t
index 5618014..a293870 100644 (file)
--- a/t/optional_lighttpd-fastcgi-non-root.t
+++ b/t/optional_lighttpd-fastcgi-non-root.t
@@ -8,14 +8,25 @@ use FindBin;
 use IO::Socket;
 use Test::More;
 
+plan skip_all => 'set TEST_LIGHTTPD to enable this test' 
+    unless $ENV{TEST_LIGHTTPD};
+    
+eval "use FCGI";
+plan skip_all => 'FCGI required' if $@;
+
 eval "use Catalyst::Devel 1.0";
 plan skip_all => 'Catalyst::Devel required' if $@;
 
 eval "use File::Copy::Recursive";
 plan skip_all => 'File::Copy::Recursive required' if $@;
 
-my $lighttpd_bin = $ENV{LIGHTTPD_BIN};
-plan skip_all => 'Please set LIGHTTPD_BIN to run this test'
+eval "use Test::Harness";
+plan skip_all => 'Test::Harness required' if $@;
+
+my $lighttpd_bin = $ENV{LIGHTTPD_BIN} || `which lighttpd`;
+chomp $lighttpd_bin;
+
+plan skip_all => 'Please set LIGHTTPD_BIN to the path to lighttpd'
     unless $lighttpd_bin && -x $lighttpd_bin;
 
 plan tests => 1;
@@ -45,6 +56,7 @@ my $conf = <<"END";
 server.modules = (
     "mod_access",
     "mod_fastcgi",
+    "mod_rewrite",
     "mod_accesslog"
 )
 
@@ -56,6 +68,10 @@ accesslog.filename = "$docroot/access.log"
 server.bind = "127.0.0.1"
 server.port = $port
 
+# Work around inability to hit http://localhost/deep/path
+# without a trailing slash 
+url.rewrite = ( "deep/path\$" => "deep/path/" )
+
 # catalyst app specific fcgi setup
 fastcgi.server = (
     "/deep/path" => (
@@ -71,7 +87,8 @@ fastcgi.server = (
 )
 END
 
-open(my $lightconf, '>', "$docroot/lighttpd.conf") or die "Can't open $docroot/lighttpd.conf: $!";
+open(my $lightconf, '>', "$docroot/lighttpd.conf") 
+  or die "Can't open $docroot/lighttpd.conf: $!";
 print {$lightconf} $conf or die "Write error: $!";
 close $lightconf;
 
@@ -79,14 +96,19 @@ my $pid = open my $lighttpd, "$lighttpd_bin -D -f $docroot/lighttpd.conf 2>&1 |"
     or die "Unable to spawn lighttpd: $!";
     
 # wait for it to start
-print "Waiting for server to start...\n";
 while ( check_port( 'localhost', $port ) != 1 ) {
+    diag "Waiting for server to start...";
     sleep 1;
 }
 
 # run the testsuite against the server
 $ENV{CATALYST_SERVER} = "http://localhost:$port/deep/path";
-system( 'prove -r -Ilib/ t/live_*' );
+
+my @tests = (shift) || glob('t/live_*');
+eval {
+    runtests(@tests);
+};
+ok(!$@, 'lighttpd tests ran OK');
 
 # shut it down
 kill 'INT', $pid;
@@ -95,8 +117,6 @@ close $lighttpd;
 # clean up
 rmtree "$FindBin::Bin/../t/tmp" if -d "$FindBin::Bin/../t/tmp";
 
-ok( 'done' );
-
 sub check_port {
     my ( $host, $port ) = @_;