X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Foptional_lighttpd-fastcgi-non-root.t;h=a293870b3f27c40ed561c52129c80205d70dd2b5;hb=0ce22ad477633bd8a0cd0a9d85d255d9683e1ea7;hp=6e9fe0653a90278fbc343dd04c66e428eefb89f5;hpb=7f6fd84672667ae57cee3322f03c60dabb82f38d;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/optional_lighttpd-fastcgi-non-root.t b/t/optional_lighttpd-fastcgi-non-root.t
index 6e9fe06..a293870 100644
--- a/t/optional_lighttpd-fastcgi-non-root.t
+++ b/t/optional_lighttpd-fastcgi-non-root.t
@@ -3,29 +3,16 @@
 use strict;
 use warnings;
 
-BEGIN {
-    use Test::More;
-
-    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} || 'lighttpd';
-    plan skip_all => 'Cannot find lighttpd, please set LIGHTTPD_BIN'
-    unless -x $lighttpd_bin;
-
-    plan tests => 1;
-
-};
-
 use File::Path;
 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 $@;
@@ -69,6 +56,7 @@ my $conf = <<"END";
 server.modules = (
     "mod_access",
     "mod_fastcgi",
+    "mod_rewrite",
     "mod_accesslog"
 )
 
@@ -80,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" => (
@@ -112,7 +104,7 @@ while ( check_port( 'localhost', $port ) != 1 ) {
 # run the testsuite against the server
 $ENV{CATALYST_SERVER} = "http://localhost:$port/deep/path";
 
-my @tests = glob('t/live_*');
+my @tests = (shift) || glob('t/live_*');
 eval {
     runtests(@tests);
 };