Updated and expanded test suit

[catagits/Catalyst-Runtime.git] / t / engine / request / uploads.t

diff --git a/t/engine/request/uploads.t b/t/engine/request/uploads.t
index 842ead5..adb43d2 100644 (file)
--- a/t/engine/request/uploads.t
+++ b/t/engine/request/uploads.t
@@ -6,10 +6,11 @@ use warnings;
 use FindBin;
 use lib "$FindBin::Bin/../../lib";
 
-use Test::More no_plan => 1;
+use Test::More tests => 39;
 use Catalyst::Test 'TestApp';
 
 use Catalyst::Request;
+use Catalyst::Request::Upload;
 use HTTP::Headers;
 use HTTP::Headers::Util 'split_header_words';
 use HTTP::Request::Common;
@@ -28,9 +29,9 @@ use HTTP::Request::Common;
 
     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_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' );
@@ -47,11 +48,54 @@ use HTTP::Request::Common;
         my %parameters  = @{ ( split_header_words($disposition) )[0] };
 
         my $upload = $creq->uploads->{ $parameters{filename} };
+        
+        isa_ok( $upload, 'Catalyst::Request::Upload' );
 
-        isnt( $upload, undef, 'Upload filename' );
-        is( $upload->{type}, $part->content_type, 'Upload Content-Type' );
-        is( $upload->{size}, length( $part->content ), 'Upload Content-Length' );
+        is( $upload->type, $part->content_type, 'Upload Content-Type' );
+        is( $upload->size, length( $part->content ), 'Upload Content-Length' );
     }
+}
+
+{
+    my $creq;
+
+    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" ],
+         ]
+    );
 
-    #warn $response->as_string;
+    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' );
+    
+    {
+        no strict 'refs';
+        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' );
+    
+    my @parts = $request->parts;
+
+    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];
+        
+        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' );
+    }
 }