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=76eaa876a016e81e4ad7d319572ea2c580295502;hp=3b8e965f2fb8fb784f4e13498b61365e01f0c5ae;hb=d200092825d92139d59f660eaa895790442cdf8b;hpb=c566191065a603f466e5066fdd2c0337ed080a75

diff --git a/t/utf_incoming.t b/t/utf_incoming.t
index 3b8e965..76eaa87 100644
--- a/t/utf_incoming.t
+++ b/t/utf_incoming.t
@@ -3,6 +3,7 @@ use warnings;
 use strict;
 use Test::More;
 use HTTP::Request::Common;
+use HTTP::Message::PSGI ();
 use Encode 2.21 'decode_utf8', 'encode_utf8';
 use File::Spec;
 use JSON::MaybeXS;
@@ -62,6 +63,8 @@ use JSON::MaybeXS;
 
         Test::More::is $c->req->args->[0], 'â¥';
         Test::More::is $c->req->captures->[0], 'â¥';
+        Test::More::is $arg, 'â¥';
+        Test::More::is length($arg), 1, "got length of one";
 
         $c->response->body("<p>This is base-link action â¥ ${\$c->req->args->[0]}</p>");
 
@@ -131,6 +134,7 @@ use JSON::MaybeXS;
     my $post = $c->req->body_data;
 
     Test::More::is $post->{'â¥'}, 'â¥â¥';
+    Test::More::is length($post->{'â¥'}), 2;
     $c->response->content_type('application/json');
 
     # Encode JSON also encodes to a UTF-8 encoded, binary string. This is why we don't
@@ -161,12 +165,31 @@ use JSON::MaybeXS;
     $c->response->body(Compress::Zlib::memGzip(Encode::encode_utf8("manual_1 â¥")));
   }
 
+  sub override_encoding :Local {
+    my ($self, $c) = @_;
+    $c->res->content_type('text/plain');
+    $c->encoding(Encode::find_encoding('UTF-8'));
+    $c->encoding(Encode::find_encoding('Shift_JIS'));
+    $c->response->body("ãã¹ã");
+  }
+
+  sub stream_write_error :Local {
+    my ($self, $c) = @_;
+    $c->response->content_type('text/html');
+    $c->response->write("<p>This is stream_write action â¥</p>");
+    $c->encoding(Encode::find_encoding('Shift_JIS'));
+    $c->response->write("<p>This is stream_write action â¥</p>");
+  }
+
+  sub from_external_psgi :Local {
+    my ($self, $c) = @_;
+    my $env = HTTP::Message::PSGI::req_to_psgi( HTTP::Request::Common::GET '/root/â¥');
+    $c->res->from_psgi_response( ref($c)->to_app->($env));
+  }
+
   package MyApp;
   use Catalyst;
 
-  # Default encoding is now UTF-8
-  # MyApp->config(encoding=>'UTF-8');
-
   Test::More::ok(MyApp->setup, 'setup app');
 }
 
@@ -268,6 +291,11 @@ use Catalyst::Test 'MyApp';
     is $c->req->query_parameters->{'â¥'}, 'â¥â¥';
     is $c->req->body_parameters->{'â¥'}, 'â¥â¥';
     is $c->req->parameters->{'â¥'}[0], 'â¥â¥'; #combined with query and body
+    is $c->req->args->[0], 'â¥';
+    is length($c->req->parameters->{'â¥'}[0]), 2;
+    is length($c->req->query_parameters->{'â¥'}), 2;
+    is length($c->req->body_parameters->{'â¥'}), 2;
+    is length($c->req->args->[0]), 1;
     is $res->content_charset, 'UTF-8';
   }
 }
@@ -351,6 +379,17 @@ use Catalyst::Test 'MyApp';
 }
 
 {
+  ok my $res = request "/root/override_encoding";
+  ok my $enc = Encode::find_encoding('SHIFT_JIS');
+
+  is $res->code, 200, 'OK';
+  is $enc->decode($res->content), "ãã¹ã", 'correct body';
+  is $res->content_length, 6, 'correct length'; # Bytes over the wire
+  is length($enc->decode($res->content)), 3;
+  is $res->content_charset, 'SHIFT_JIS';
+}
+
+{
   my $res = request "/root/manual_1";
 
   is $res->code, 200, 'OK';
@@ -372,6 +411,22 @@ SKIP: {
   is $res->content_charset, 'UTF-8';
 }
 
+{
+  my $res = request "/root/stream_write_error";
+
+  is $res->code, 200, 'OK';
+  like decode_utf8($res->content), qr[<p>This is stream_write action â¥</p><!DOCTYPE html], 'correct body';
+}
+
+{
+  my $res = request "/root/from_external_psgi";
+
+  is $res->code, 200, 'OK';
+  is decode_utf8($res->content), '<p>This is path-heart action â¥</p>', 'correct body';
+  is $res->content_length, 36, 'correct length';
+  is $res->content_charset, 'UTF-8';
+}
+
 ## should we use binmode on filehandles to force the encoding...?
 ## Not sure what else to do with multipart here, if docs are enough...
 
