X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Futf_incoming.t;h=a95f58a807b96127fffa82d9836286c0de8ddb3d;hp=5f12ecb57182a9a902a7061cc09e1330aac76ace;hb=6c217fb3c36a6e0ac4ef82b839ee3d5ed924e2e5;hpb=6b9f9ef742c1ee771df336eed1db42d807c8c59c

diff --git a/t/utf_incoming.t b/t/utf_incoming.t
index 5f12ecb..a95f58a 100644
--- a/t/utf_incoming.t
+++ b/t/utf_incoming.t
@@ -7,9 +7,10 @@ use HTTP::Message::PSGI ();
 use Encode 2.21 'decode_utf8', 'encode_utf8', 'encode';
 use File::Spec;
 use JSON::MaybeXS;
+use Data::Dumper;
 use Scalar::Util ();
 
-# Test cases for incoming utf8 
+# Test cases for incoming utf8
 
 {
   package MyApp::Controller::Root;
@@ -72,7 +73,7 @@ use Scalar::Util ();
         # Test to make sure redirect can now take an object (sorry don't have a better place for it
         # but wanted test coverage.
         my $location = $c->res->redirect( $c->uri_for($c->controller('Root')->action_for('uri_for')) );
-        Test::More::ok !ref $location; 
+        Test::More::ok !ref $location;
       }
 
   sub stream_write :Local {
@@ -139,6 +140,26 @@ use Scalar::Util ();
     $c->response->body($decoded_text);
   }
 
+  sub file_upload_utf8_param :POST  Consumes(Multipart) Local {
+    my ($self, $c) = @_;
+
+    Test::More::is $c->req->body_parameters->{'♥'}, '♥♥';
+    Test::More::ok my $upload = $c->req->uploads->{'♥'};
+    Test::More::is $upload->charset, 'UTF-8';
+
+    my $text = $upload->slurp;
+    Test::More::is Encode::decode_utf8($text), "<p>This is stream_body_fh action ♥</p>\n";
+
+    my $decoded_text = $upload->decoded_slurp;
+    Test::More::is $decoded_text, "<p>This is stream_body_fh action ♥</p>\n";
+
+    Test::More::is $upload->filename, '♥ttachment.txt';
+    Test::More::is $upload->raw_basename, '♥ttachment.txt';
+
+    $c->response->content_type('text/html');
+    $c->response->body($decoded_text);
+  }
+
   sub json :POST Consumes(JSON) Local {
     my ($self, $c) = @_;
     my $post = $c->req->body_data;
@@ -149,7 +170,7 @@ use Scalar::Util ();
 
     # Encode JSON also encodes to a UTF-8 encoded, binary string. This is why we don't
     # have application/json as one of the things we match, otherwise we get double
-    # encoding.  
+    # encoding.
     $c->response->body(JSON::MaybeXS::encode_json($post));
   }
 
@@ -203,10 +224,17 @@ use Scalar::Util ();
     $c->response->body($c->req->body_parameters->{arg});
   }
 
+  sub echo_param :Local {
+    my ($self, $c) = @_;
+    $c->response->content_type('text/plain');
+    $c->response->body($c->req->query_parameters->{arg});
+  }
+
+
   package MyApp;
   use Catalyst;
 
-  Test::More::ok(MyApp->setup, 'setup app');
+  Test::More::ok(MyApp->setup('-Log=fatal'), 'setup app');
 }
 
 ok my $psgi = MyApp->psgi_app, 'build psgi app';
@@ -392,6 +420,16 @@ use Catalyst::Test 'MyApp';
 }
 
 {
+  ok my $path = File::Spec->catfile('t', 'utf8.txt');
+  ok my $req = POST '/root/file_upload_utf8_param',
+    Content_Type => 'form-data',
+    Content =>  [encode_utf8('♥')=>encode_utf8('♥♥'), encode_utf8('♥')=>["$path", encode_utf8('♥ttachment.txt'), 'Content-Type' =>'text/html; charset=UTF-8', ]];
+
+  ok my $res = request $req;
+  is decode_utf8($res->content), "<p>This is stream_body_fh action ♥</p>\n";
+}
+
+{
   ok my $req = POST '/root/json',
      Content_Type => 'application/json',
      Content => encode_json +{'♥'=>'♥♥'}; # Note: JSON does the UTF* encoding for us
@@ -499,6 +537,29 @@ SKIP: {
   is $c->req->query_parameters->{'a'}, $shiftjs, 'got expected value';
 }
 
+{
+    my $invalid = '%e2';
+    # in url
+    {
+        my $req = GET "/$invalid";
+        my $res = request $req;
+        is ($res->code, '400', "Invalid url param is 400");
+    }
+    # in body
+    {
+        my $req = POST "/root/echo_arg", Content => "arg0=$invalid";
+        my $res = request $req;
+        is ($res->code, '400', "Invalid post param is 400");
+    }
+    # in query
+    {
+        # failing since 5.90080
+        my $req = GET "/root/echo_param?arg=$invalid";
+        my $res = request $req;
+        is ($res->code, '400', "Invalid get param is 400") or diag Dumper($res->decoded_content);
+    }
+}
+
 ## should we use binmode on filehandles to force the encoding...?
 ## Not sure what else to do with multipart here, if docs are enough...