X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Faggregate%2Flive_engine_request_uploads.t;h=5eb2f8ccae27640c314eaeb0aec46b3f49a1128a;hp=35ec9c7f59b0fc471f30a22db6b460ccf4dfcf61;hb=88e5a8b0c4d28e46b8ba6b6b9567063e57af9063;hpb=513ac93dffaf4ccc7531c77421da6f738215f233 diff --git a/t/aggregate/live_engine_request_uploads.t b/t/aggregate/live_engine_request_uploads.t index 35ec9c7..5eb2f8c 100644 --- a/t/aggregate/live_engine_request_uploads.t +++ b/t/aggregate/live_engine_request_uploads.t @@ -1,5 +1,3 @@ -#!perl - use strict; use warnings; @@ -160,7 +158,7 @@ use Path::Class::Dir; ok( $response->is_success, 'Response Successful 2xx' ); is( $response->content_type, 'text/plain', 'Response Content-Type' ); is( $response->content, ( $request->parts )[0]->content, 'Content' ); - + # XXX: no way to test that temporary file for this test was deleted } @@ -216,7 +214,7 @@ use Path::Class::Dir; 'Unserialize Catalyst::Request' ); } - + for my $file ( $creq->upload ) { my $upload = $creq->upload($file); SKIP: @@ -286,7 +284,7 @@ use Path::Class::Dir; is( $upload->size, length( $part->content ), 'Upload Content-Length' ); is( $upload->filename, 'catalyst_130pix.gif', 'Upload Filename' ); is( $upload->basename, 'catalyst_130pix.gif', 'Upload basename' ); - + SKIP: { if ( $ENV{CATALYST_SERVER} ) { @@ -334,6 +332,14 @@ use Path::Class::Dir; if ( $ENV{CATALYST_SERVER} ) { skip 'Not testing for deleted file on remote server', 1; } + + # JNAP, I added the following line in order to properly let + # the $env go out of scope so that the associated tempfile + # would be deleted. I think somewhere Catalyst::Test closed + # over ENV and holds state until a new command is issues but + # I can't find it. + + request GET 'http://localhost/'; ok( !-e $body->body->filename, 'Upload temp file was deleted' ); } } @@ -344,7 +350,7 @@ SKIP: if ( $ENV{CATALYST_SERVER} ) { skip 'Not testing uploadtmp on remote server', 14; } - + my $creq; my $dir = "$FindBin::Bin/";