X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Faggregate%2Flive_engine_request_uploads.t;h=5eb2f8ccae27640c314eaeb0aec46b3f49a1128a;hb=46c460c978d459939ed500058772505d34ad013e;hp=df98f08a7023a24aae4816130c7e4b81401d92b4;hpb=ae29b412955743885e80350085167b54b69672da;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/aggregate/live_engine_request_uploads.t b/t/aggregate/live_engine_request_uploads.t
index df98f08..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;
 
@@ -8,7 +6,7 @@ use lib "$FindBin::Bin/../lib";
 
 use Test::More tests => 105;
 use Catalyst::Test 'TestApp';
-
+use Scalar::Util qw/ blessed /;
 use Catalyst::Request;
 use Catalyst::Request::Upload;
 use HTTP::Body::OctetStream;
@@ -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
 }
 
@@ -197,9 +195,17 @@ use Path::Class::Dir;
     ok( my $response = request($request), 'Request' );
     ok( $response->is_success, 'Response Successful 2xx' );
     is( $response->content_type, 'text/plain', 'Response Content-Type' );
-    like( $response->content, qr/file1 => bless/, 'Upload with name file1');
-    like( $response->content, qr/file2 => bless/, 'Upload with name file2');
-    
+    {
+        local $@;
+        my $request = eval $response->content;
+        if ($@) {
+            fail("Could not inflate response: $@ " . $response->content);
+        }
+        else {
+            ok blessed($request->uploads->{file1}), 'Upload with name file1';
+            ok blessed($request->uploads->{file2}),'Upload with name file2';
+        }
+    }
     my $creq;
     {
         no strict 'refs';
@@ -208,7 +214,7 @@ use Path::Class::Dir;
             'Unserialize Catalyst::Request'
         );
     }
-    
+
     for my $file ( $creq->upload ) {
         my $upload = $creq->upload($file);
         SKIP:
@@ -278,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} ) {
@@ -326,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' );
     }
 }
@@ -336,7 +350,7 @@ SKIP:
     if ( $ENV{CATALYST_SERVER} ) {
         skip 'Not testing uploadtmp on remote server', 14;
     }
-    
+
     my $creq;
 
     my $dir = "$FindBin::Bin/";