when a POST supplies content encoding, dont assume UTF8

[catagits/Catalyst-Runtime.git] / t / utf_incoming.t

diff --git a/t/utf_incoming.t b/t/utf_incoming.t
index dbed329..332ff76 100644 (file)
--- a/t/utf_incoming.t
+++ b/t/utf_incoming.t
@@ -7,6 +7,7 @@ use HTTP::Message::PSGI ();
 use Encode 2.21 'decode_utf8', 'encode_utf8', 'encode';
 use File::Spec;
 use JSON::MaybeXS;
+use Scalar::Util ();
 
 # Test cases for incoming utf8 
 
@@ -441,6 +442,7 @@ SKIP: {
     Content_Type => 'form-data',
       Content =>  [
         arg0 => 'helloworld',
+        Encode::encode('UTF-8','♥') => Encode::encode('UTF-8','♥♥'),  # Long form POST simple does not auto encode...
         arg1 => [
           undef, '',
           'Content-Type' =>'text/plain; charset=UTF-8',
@@ -457,11 +459,20 @@ SKIP: {
 
   my ($res, $c) = ctx_request $req;
 
+  use Devel::Dwarn;
+  #Dwarn $c->req->body_parameters;
+
   is $c->req->body_parameters->{'arg0'}, 'helloworld', 'got helloworld value';
+  is $c->req->body_parameters->{'♥'}, '♥♥';
+
+  ok Scalar::Util::blessed($c->req->body_parameters->{'arg1'});
+  ok Scalar::Util::blessed($c->req->body_parameters->{'arg2'}[0]);
+  ok Scalar::Util::blessed($c->req->body_parameters->{'arg2'}[1]);
 
-  # We expect catalyst to have decoded this
-  is $c->req->body_parameters->{'arg1'}, $utf8, 'decoded utf8 param';
-  is $c->req->body_parameters->{'arg2'}[0], $shiftjs, 'decoded shiftjis param';
+  # Since the form post is COMPLEX you are expected to decode it yourself.
+  is Encode::decode('UTF-8', $c->req->body_parameters->{'arg1'}->raw_data), $utf8, 'decoded utf8 param';
+  is Encode::decode('SHIFT_JIS', $c->req->body_parameters->{'arg2'}[0]->raw_data), $shiftjs, 'decoded shiftjis param';
+  is Encode::decode('SHIFT_JIS', $c->req->body_parameters->{'arg2'}[1]->raw_data), $shiftjs, 'decoded shiftjis param';
 
 }