X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fcgibin.t;h=0e8179d68378cc23c342b5e01f2660bfa33967b6;hb=6c725e0b97ac472fd657ee11e39a824863405695;hp=5430b3f472088d1f1ea48861948090d4c19632ee;hpb=5709e6bdaf32ff9891714906eac638eb5c55aa80;p=catagits%2FCatalyst-Controller-WrapCGI.git

diff --git a/t/cgibin.t b/t/cgibin.t
index 5430b3f..0e8179d 100644
--- a/t/cgibin.t
+++ b/t/cgibin.t
@@ -6,14 +6,24 @@ use warnings;
 use FindBin '$Bin';
 use lib "$Bin/lib";
 
-use Test::More tests => 9;
+use Test::More;
+use HTTP::Request::Common;
+
+my %orig_sig;
+BEGIN {
+    %orig_sig = %SIG;
+# perl < 5.8.9 won't set a %SIG entry to undef, it sets it to ''
+    %orig_sig = map { defined $_ ? $_ : '' } %orig_sig
+        if $] < 5.008009;
+}
 
 use Catalyst::Test 'TestCGIBin';
-use HTTP::Request::Common;
 
 # this should be ignored
 $ENV{MOD_PERL} = "mod_perl/2.0";
 
+is_deeply \%SIG, \%orig_sig, '%SIG is preserved on compile';
+
 my $response = request POST '/my-bin/path/test.pl', [
     foo => 'bar',
     bar => 'baz'
@@ -39,13 +49,9 @@ $response = request POST '/my-bin/exit.pl', [
 
 is($response->code, 500, 'POST to Perl CGI with nonzero exit()');
 
-$response = request POST '/cgihandler/dongs', [
-    foo => 'bar',
-    bar => 'baz'
-];
+$response = request '/my-bin/ignored.cgi';
 
-is($response->content, 'foo:bar bar:baz',
-    'POST to Perl CGI File through a forward');
+is($response->code, 500, "file not matching 'cgi_file_pattern' is ignored");
 
 $response = request POST '/cgihandler/mtfnpy', [
     foo => 'bar',
@@ -56,19 +62,35 @@ is($response->content, 'foo:bar bar:baz',
     'POST to Perl CGI File through a forward via cgi_action');
 
 $response = request '/my-bin/path/testdata.pl';
-is($response->content, "testing\n",
+like($response->content, qr/^testing\r?\n\z/,
     'scripts with __DATA__ sections work');
 
 $response = request '/my-bin/pathinfo.pl/path/info';
 is($response->content, '/path/info',
     'PATH_INFO works');
 
+ok request '/my-bin/sigs.pl';
+
+is_deeply \%SIG, \%orig_sig, '%SIG is preserved';
+
 SKIP: {
     skip "Can't run shell scripts on non-*nix", 1
         if $^O eq 'MSWin32' || $^O eq 'VMS';
 
 # for some reason the +x is not preserved in the dist
     system "chmod +x $Bin/lib/TestCGIBin/root/cgi-bin/test.sh";
+    system "chmod +x $Bin/lib/TestCGIBin/root/cgi-bin/exit_nonzero.sh";
 
     is(get('/my-bin/test.sh'), "Hello!\n", 'Non-Perl CGI File');
+
+    $response = request GET '/my-bin/exit_nonzero.sh';
+    is $response->code, 500, 'Non-Perl CGI with non-zero exit dies';
 }
+
+{ $response = get('/my-bin/time.pl');
+  sleep 1;
+  my $response_2 =  get('/my-bin/time.pl');
+  isnt( $response, $response_2, 'cgis are getting invoked each time' );
+}
+
+done_testing;