Create branch register_actions.

[catagits/Catalyst-Runtime.git] / t / aggregate / live_engine_request_uploads.t

diff --git a/t/live_engine_request_uploads.t b/t/aggregate/live_engine_request_uploads.t
similarity index 75%
rename from t/live_engine_request_uploads.t
rename to t/aggregate/live_engine_request_uploads.t
index bab8501..df98f08 100644 (file)
--- a/t/live_engine_request_uploads.t
+++ b/t/aggregate/live_engine_request_uploads.t
@@ -4,13 +4,14 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
-use Test::More tests => 88;
+use Test::More tests => 105;
 use Catalyst::Test 'TestApp';
 
 use Catalyst::Request;
 use Catalyst::Request::Upload;
+use HTTP::Body::OctetStream;
 use HTTP::Headers;
 use HTTP::Headers::Util 'split_header_words';
 use HTTP::Request::Common;
@@ -61,7 +62,7 @@ use Path::Class::Dir;
         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' );
 
@@ -69,7 +70,7 @@ use Path::Class::Dir;
         is( $upload->size, length( $part->content ), 'Upload Content-Length' );
 
         # make sure upload is accessible via legacy params->{$file}
-        is( $creq->{parameters}->{ $upload->filename },
+        is( $creq->parameters->{ $upload->filename },
             $upload->filename, 'legacy param method ok' );
 
         SKIP:
@@ -127,12 +128,13 @@ use Path::Class::Dir;
         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' );
+        is( $upload->basename, $parameters{filename}, 'Upload basename' );
 
         SKIP:
         {
@@ -158,6 +160,8 @@ 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
 }
 
 {
@@ -165,7 +169,7 @@ use Path::Class::Dir;
         'http://localhost/dump/request',
         'Content-Type' => 'multipart/form-data',
         'Content'      =>
-          [ 'file' => ["$FindBin::Bin/catalyst_130pix.gif"], ]
+          [ 'file' => ["$FindBin::Bin/../catalyst_130pix.gif"], ]
     );
 
     # LWP will auto-correct Content-Length when using a remote server
@@ -186,8 +190,8 @@ use Path::Class::Dir;
         'http://localhost/dump/request',
         'Content-Type' => 'multipart/form-data',
         'Content'      =>
-          [ 'file1' => ["$FindBin::Bin/catalyst_130pix.gif"],
-            'file2' => ["$FindBin::Bin/catalyst_130pix.gif"], ]
+          [ 'file1' => ["$FindBin::Bin/../catalyst_130pix.gif"],
+            'file2' => ["$FindBin::Bin/../catalyst_130pix.gif"], ]
     );
 
     ok( my $response = request($request), 'Request' );
@@ -195,6 +199,26 @@ use Path::Class::Dir;
     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');
+    
+    my $creq;
+    {
+        no strict 'refs';
+        ok(
+            eval '$creq = ' . $response->content,
+            'Unserialize Catalyst::Request'
+        );
+    }
+    
+    for my $file ( $creq->upload ) {
+        my $upload = $creq->upload($file);
+        SKIP:
+        {
+            if ( $ENV{CATALYST_SERVER} ) {
+                skip 'Not testing for deleted file on remote server', 1;
+            }
+            ok( !-e $upload->tempname, 'Upload temp file was deleted' );
+        }
+    }
 }
 
 {
@@ -205,7 +229,7 @@ use Path::Class::Dir;
         'Content-Type' => 'form-data',
         'Content'      => [
             'testfile' => 'textfield value',
-            'testfile' => ["$FindBin::Bin/catalyst_130pix.gif"],
+            'testfile' => ["$FindBin::Bin/../catalyst_130pix.gif"],
         ]
     );
 
@@ -233,7 +257,7 @@ use Path::Class::Dir;
     is( $creq->content_length, $request->content_length,
         'Catalyst::Request Content-Length' );
 
-    my $param = $creq->{parameters}->{testfile};
+    my $param = $creq->parameters->{testfile};
 
     ok( @$param == 2, '2 values' );
     is( $param->[0], 'textfield value', 'correct value' );
@@ -246,13 +270,63 @@ use Path::Class::Dir;
 
         next unless exists $parameters{filename};
 
-        my $upload = $creq->{uploads}->{ $parameters{name} };
+        my $upload = $creq->uploads->{ $parameters{name} };
 
         isa_ok( $upload, 'Catalyst::Request::Upload' );
 
         is( $upload->type, $part->content_type, 'Upload Content-Type' );
         is( $upload->size, length( $part->content ), 'Upload Content-Length' );
-        is( $upload->filename, 'catalyst_130pix.gif' );
+        is( $upload->filename, 'catalyst_130pix.gif', 'Upload Filename' );
+        is( $upload->basename, 'catalyst_130pix.gif', 'Upload basename' );
+        
+        SKIP:
+        {
+            if ( $ENV{CATALYST_SERVER} ) {
+                skip 'Not testing for deleted file on remote server', 1;
+            }
+            ok( !-e $upload->tempname, 'Upload temp file was deleted' );
+        }
+    }
+}
+
+# Test PUT request with application/octet-stream file gets deleted
+
+{
+    my $body;
+
+    my $request = PUT(
+        'http://localhost/dump/body/',
+        'Content-Type' => 'application/octet-stream',
+        'Content'      => 'foobarbaz',
+        'Content-Length' => 9,
+    );
+
+    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\( .* 'HTTP::Body::OctetStream' \)/s,
+       'Content is a serialized HTTP::Body::OctetStream'
+    );
+
+    {
+        no strict 'refs';
+        ok(
+            eval '$body = ' . substr( $response->content, 8 ), # FIXME - substr not needed in other test cases?
+            'Unserialize HTTP::Body::OctetStream'
+        ) or warn $@;
+    }
+
+    isa_ok( $body, 'HTTP::Body::OctetStream' );
+    isa_ok($body->body, 'File::Temp');
+
+    SKIP:
+    {
+        if ( $ENV{CATALYST_SERVER} ) {
+            skip 'Not testing for deleted file on remote server', 1;
+        }
+        ok( !-e $body->body->filename, 'Upload temp file was deleted' );
     }
 }
 
@@ -260,7 +334,7 @@ use Path::Class::Dir;
 SKIP:
 {
     if ( $ENV{CATALYST_SERVER} ) {
-        skip 'Not testing uploadtmp on remote server', 13;
+        skip 'Not testing uploadtmp on remote server', 14;
     }
     
     my $creq;
@@ -316,6 +390,8 @@ SKIP:
         is( $upload->size, length( $part->content ), 'Upload Content-Length' );
 
         like( $upload->tempname, qr{\Q$dir\E}, 'uploadtmp' );
+
+        ok( !-e $upload->tempname, 'Upload temp file was deleted' );
     }
 }