X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Flive%2Fengine%2Frequest%2Fuploads.t;fp=t%2Fengine%2Frequest%2Fuploads.t;h=fa753c14015d0d27e38104923aaabfac929be6ad;hp=f24b60b6e7886f21acced1130f55b481b08703ce;hb=fbcc39ad23f2bbecf5d84c9ba581e6af86fcd460;hpb=21465c884872c1ec8c30acd72796445f9eaacb31

diff --git a/t/engine/request/uploads.t b/t/live/engine/request/uploads.t
similarity index 52%
rename from t/engine/request/uploads.t
rename to t/live/engine/request/uploads.t
index f24b60b..fa753c1 100644
--- a/t/engine/request/uploads.t
+++ b/t/live/engine/request/uploads.t
@@ -6,7 +6,7 @@ use warnings;
 use FindBin;
 use lib "$FindBin::Bin/../../lib";
 
-use Test::More tests => 43;
+use Test::More tests => 49;
 use Catalyst::Test 'TestApp';
 
 use Catalyst::Request;
@@ -18,100 +18,123 @@ use HTTP::Request::Common;
 {
     my $creq;
 
-    my $request = POST( 'http://localhost/dump/request/',
-        'Content-Type' => 'multipart/form-data',
+    my $request = POST(
+        'http://localhost/dump/request/',
+        'Content-Type' => 'form-data',
         'Content'      => [
-            'cookies.t' => [ "$FindBin::Bin/cookies.t" ],
-            'headers.t' => [ "$FindBin::Bin/headers.t" ],
-            'uploads.t' => [ "$FindBin::Bin/uploads.t" ],
-         ]
+            'cookies.t' => ["$FindBin::Bin/cookies.t"],
+            'headers.t' => ["$FindBin::Bin/headers.t"],
+            'uploads.t' => ["$FindBin::Bin/uploads.t"],
+        ]
     );
 
     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/^bless\( .* 'Catalyst::Request' \)$/s, 'Content is a serialized Catalyst::Request' );
-    
+    is( $response->content_type, 'text/plain', 'Response Content-Type' );
+    like(
+        $response->content,
+        qr/^bless\( .* 'Catalyst::Request' \)$/s,
+        'Content is a serialized Catalyst::Request'
+    );
+
     {
         no strict 'refs';
-        ok( eval '$creq = ' . $response->content, 'Unserialize Catalyst::Request' );
+        ok(
+            eval '$creq = ' . $response->content,
+            'Unserialize Catalyst::Request'
+        );
     }
 
     isa_ok( $creq, 'Catalyst::Request' );
     is( $creq->method, 'POST', 'Catalyst::Request method' );
-    is( $creq->content_type, 'multipart/form-data', 'Catalyst::Request Content-Type' );
-    is( $creq->content_length, $request->content_length, 'Catalyst::Request Content-Length' );
+    is( $creq->content_type, 'multipart/form-data',
+        'Catalyst::Request Content-Type' );
+    is( $creq->content_length, $request->content_length,
+        'Catalyst::Request Content-Length' );
 
     for my $part ( $request->parts ) {
 
         my $disposition = $part->header('Content-Disposition');
         my %parameters  = @{ ( split_header_words($disposition) )[0] };
 
-        my $upload = $creq->uploads->{ $parameters{filename} };
-        
+        my $upload = $creq->{uploads}->{ $parameters{filename} };
+
         isa_ok( $upload, 'Catalyst::Request::Upload' );
 
         is( $upload->type, $part->content_type, 'Upload Content-Type' );
         is( $upload->size, length( $part->content ), 'Upload Content-Length' );
+        
+        ok( ! -e $upload->tempname, 'Upload temp file was deleted' );
     }
 }
 
 {
     my $creq;
 
-    my $request = POST( 'http://localhost/dump/request/',
+    my $request = POST(
+        'http://localhost/dump/request/',
         'Content-Type' => 'multipart/form-data',
         'Content'      => [
-            'testfile' => [ "$FindBin::Bin/cookies.t" ],
-            'testfile' => [ "$FindBin::Bin/headers.t" ],
-            'testfile' => [ "$FindBin::Bin/uploads.t" ],
-         ]
+            'testfile' => ["$FindBin::Bin/cookies.t"],
+            'testfile' => ["$FindBin::Bin/headers.t"],
+            'testfile' => ["$FindBin::Bin/uploads.t"],
+        ]
     );
 
     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/^bless\( .* 'Catalyst::Request' \)$/s, 'Content is a serialized Catalyst::Request' );
-    
+    is( $response->content_type, 'text/plain', 'Response Content-Type' );
+    like(
+        $response->content,
+        qr/^bless\( .* 'Catalyst::Request' \)$/s,
+        'Content is a serialized Catalyst::Request'
+    );
+
     {
         no strict 'refs';
-        ok( eval '$creq = ' . $response->content, 'Unserialize Catalyst::Request' );
+        ok(
+            eval '$creq = ' . $response->content,
+            'Unserialize Catalyst::Request'
+        );
     }
 
     isa_ok( $creq, 'Catalyst::Request' );
     is( $creq->method, 'POST', 'Catalyst::Request method' );
-    is( $creq->content_type, 'multipart/form-data', 'Catalyst::Request Content-Type' );
-    is( $creq->content_length, $request->content_length, 'Catalyst::Request Content-Length' );
-    
+    is( $creq->content_type, 'multipart/form-data',
+        'Catalyst::Request Content-Type' );
+    is( $creq->content_length, $request->content_length,
+        'Catalyst::Request Content-Length' );
+
     my @parts = $request->parts;
 
-    for ( my $i = 0; $i < @parts; $i++ ) {
-    
+    for ( my $i = 0 ; $i < @parts ; $i++ ) {
+
         my $part        = $parts[$i];
         my $disposition = $part->header('Content-Disposition');
         my %parameters  = @{ ( split_header_words($disposition) )[0] };
-        
-        my $upload = $creq->uploads->{ $parameters{name} }->[$i];
-        
+
+        my $upload = $creq->{uploads}->{ $parameters{name} }->[$i];
+
         isa_ok( $upload, 'Catalyst::Request::Upload' );
         is( $upload->type, $part->content_type, 'Upload Content-Type' );
         is( $upload->filename, $parameters{filename}, 'Upload filename' );
         is( $upload->size, length( $part->content ), 'Upload Content-Length' );
+        
+        ok( ! -e $upload->tempname, 'Upload temp file was deleted' );
     }
 }
 
 {
     my $creq;
 
-    my $request = POST( 'http://localhost/engine/request/uploads/slurp',
+    my $request = POST(
+        'http://localhost/engine/request/uploads/slurp',
         'Content-Type' => 'multipart/form-data',
-        'Content'      => [
-            'slurp' => [ "$FindBin::Bin/uploads.t" ],
-         ]
+        'Content'      => [ 'slurp' => ["$FindBin::Bin/uploads.t"], ]
     );
 
     ok( my $response = request($request), 'Request' );
     ok( $response->is_success, 'Response Successful 2xx' );
     is( $response->content_type, 'text/plain', 'Response Content-Type' );
-    is( $response->content, ($request->parts)[0]->content, 'Content' );
+    is( $response->content, ( $request->parts )[0]->content, 'Content' );
 }