fix extra_env setting in t/wrap-cgi.t for cat 5.9+

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

diff --git a/t/wrap-cgi.t b/t/wrap-cgi.t
index 57f4ff9..8317345 100644 (file)
--- a/t/wrap-cgi.t
+++ b/t/wrap-cgi.t
@@ -21,7 +21,7 @@ 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)');
 
@@ -38,21 +38,31 @@ $response = request POST '/cgi-bin/test.cgi',
     ],
     quux => [ undef, quux => Content => 4 ],
   ],
-  'Content-Type' => 'form-data';
+  User_Agent => 'perl/5',
+  Content_Type => 'form-data';
 
 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)');
+is($response->content, '/test_filepath_info/path//info',
+    'FILEPATH_INFO is correct');
 
 $response = request '/cgi-bin/mtfnpy/test_scriptname.cgi/foo/bar';
 is($response->content, '/cgi-bin/mtfnpy/test_scriptname.cgi',
     'SCRIPT_NAME is correct');
 
-$ENV{REMOTE_USER} = 'TEST_USER';
-$response = request '/cgi-bin/test_remote_user.cgi';
-is($response->content, 'TEST_USER', 'REMOTE_USER was passed');
+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',
+                       { extra_env => { REMOTE_USER => 'TEST_USER' } },
+                       );
+  is($response->content, 'TEST_USER', 'REMOTE_USER was passed');
+}