fix tests, redo (c) sections, saner is_perl_cgi, release

[catagits/Catalyst-Controller-WrapCGI.git] / t / wrap-cgi.t

diff --git a/t/wrap-cgi.t b/t/wrap-cgi.t
index 7c29988..9a2d6b0 100644 (file)
--- a/t/wrap-cgi.t
+++ b/t/wrap-cgi.t
@@ -6,7 +6,7 @@ use warnings;
 use FindBin '$Bin';
 use lib "$Bin/lib";
 
-use Test::More tests => 6;
+use Test::More tests => 7;
 
 use Catalyst::Test 'TestApp';
 use HTTP::Request::Common;
@@ -21,28 +21,46 @@ is($response->content, 'foo:bar bar:baz', 'POST to CGI');
 $response = request POST '/cgi-bin/test.cgi', [
   foo => 'bar',
   bar => 'baz',
-], 'Content-Type' => 'form-data';
+], User_Agent => 'perl/5', Content_Type => 'form-data';
 
 is($response->content, 'foo:bar bar:baz', 'POST to CGI (form-data)');
 
 $response = request POST '/cgi-bin/test.cgi',
   Content => [
-    foo => 1, bar => 2, baz => [ undef, 'baz', Content => 3 ],
+    foo => 1,
+    bar => 2,
+    baz => [
+        undef,
+        'baz',
+        'Some-Header' => 'blah',
+        'Content-Type' => 'text/plain',
+        Content => 3
+    ],
+    quux => [ undef, quux => Content => 4 ],
   ],
-  'Content-Type' => 'form-data';
+  User_Agent => 'perl/5',
+  Content_Type => 'form-data';
 
-{
-  local $TODO = 'WrapCGI does not yet construct multipart/form-data requests';
-  is($response->content, 'foo:1 bar:2 baz:3', 'POST with file upload');
-}
+is($response->content, 'foo:1 bar:2 baz:3 quux:4', 'POST with file upload');
 
 $response = request '/cgi-bin/test_pathinfo.cgi/path/%2Finfo';
-is($response->content, '/path/%2Finfo', 'PATH_INFO is correct');
+is($response->content, '/path//info', 'PATH_INFO is correct');
 
 $response = request '/cgi-bin/test_filepathinfo.cgi/path/%2Finfo';
 is($response->content, '/test_filepath_info/path/%2Finfo',
     'FILEPATH_INFO is correct (maybe)');
 
-$response = request '/cgi-bin/test_scriptname.cgi/foo/bar';
-is($response->content, '/cgi-bin/test_scriptname.cgi',
+$response = request '/cgi-bin/mtfnpy/test_scriptname.cgi/foo/bar';
+is($response->content, '/cgi-bin/mtfnpy/test_scriptname.cgi',
     'SCRIPT_NAME is correct');
+
+SKIP: {
+  require Catalyst;
+
+  skip 'no $c->req->remote_user', 1
+    if $Catalyst::VERSION < 5.80005;
+
+  $ENV{REMOTE_USER} = 'TEST_USER';
+  $response = request '/cgi-bin/test_remote_user.cgi';
+  is($response->content, 'TEST_USER', 'REMOTE_USER was passed');
+}