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=8966d561db133a19a0eea6db59ffaebf74a0063e;hp=ea621ce4fb9eed22e5193f97c9be3f494b106ea7;hb=8a79126d4370b7aa4ad841ed18a83df1f9e90ec8;hpb=dd096a3ad75ebb2c0decf75578e52fc031d60268

diff --git a/t/utf_incoming.t b/t/utf_incoming.t
index ea621ce..8966d56 100644
--- a/t/utf_incoming.t
+++ b/t/utf_incoming.t
@@ -3,6 +3,8 @@ use warnings;
 use strict;
 use Test::More;
 use HTTP::Request::Common;
+use Encode 2.21 'decode_utf8', 'encode_utf8';
+use File::Spec;
 
 # Test cases for incoming utf8 
 
@@ -74,10 +76,30 @@ use HTTP::Request::Common;
     $c->response->write("<p>This is stream_write action ♥</p>");
   }
 
+  sub stream_write_fh :Local {
+    my ($self, $c) = @_;
+    $c->response->content_type('text/html');
+
+    my $writer = $c->res->write_fh;
+
+    $writer->write(Encode::encode_utf8('<p>This is stream_write_fh action ♥</p>'));
+    $writer->close;
+  }
+
+  sub stream_body_fh :Local {
+    my ($self, $c) = @_;
+
+    my $path = File::Spec->catfile('t', 'utf8.txt');
+    open(my $fh, '<', $path) || die "trouble: $!";
+    $c->response->content_type('text/html');
+    $c->response->body($fh);
+  }
+
   package MyApp;
   use Catalyst;
 
-  MyApp->config(encoding=>'UTF-8');
+  # Default encoding is now UTF-8
+  # MyApp->config(encoding=>'UTF-8');
 
   Test::More::ok(MyApp->setup, 'setup app');
 }
@@ -85,7 +107,6 @@ use HTTP::Request::Common;
 ok my $psgi = MyApp->psgi_app, 'build psgi app';
 
 use Catalyst::Test 'MyApp';
-use Encode 2.21 'decode_utf8', 'encode_utf8';
 
 {
   my $res = request "/root/♥";
@@ -93,6 +114,7 @@ use Encode 2.21 'decode_utf8', 'encode_utf8';
   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';
 }
 
 {
@@ -101,6 +123,7 @@ use Encode 2.21 'decode_utf8', 'encode_utf8';
   is $res->code, 200, 'OK';
   is decode_utf8($res->content), '<p>This is path-heart-arg action ♥</p>', 'correct body';
   is $res->content_length, 40, 'correct length';
+  is $res->content_charset, 'UTF-8';
 }
 
 {
@@ -109,6 +132,7 @@ use Encode 2.21 'decode_utf8', 'encode_utf8';
   is $res->code, 200, 'OK';
   is decode_utf8($res->content), '<p>This is path-hat action ^</p>', 'correct body';
   is $res->content_length, 32, 'correct length';
+  is $res->content_charset, 'UTF-8';
 }
 
 {
@@ -117,6 +141,7 @@ use Encode 2.21 'decode_utf8', 'encode_utf8';
   is $res->code, 200, 'OK';
   is decode_utf8($res->content), '<p>This is base-link action ♥</p>', 'correct body';
   is $res->content_length, 35, 'correct length';
+  is $res->content_charset, 'UTF-8';
 }
 
 {
@@ -131,6 +156,7 @@ use Encode 2.21 'decode_utf8', 'encode_utf8';
   is $c->req->parameters->{'♥'}[0], '♥';
   is $c->req->parameters->{a}, 1;
   is $c->req->body_parameters->{a}, 1;
+  is $res->content_charset, 'UTF-8';
 }
 
 {
@@ -140,6 +166,7 @@ use Encode 2.21 'decode_utf8', 'encode_utf8';
   is decode_utf8($res->content), '<p>This is base-link action ♥</p>', 'correct body';
   is $res->content_length, 35, 'correct length';
   is $c->req->query_keywords, '♥♥♥';
+  is $res->content_charset, 'UTF-8';
 }
 
 {
@@ -148,6 +175,7 @@ use Encode 2.21 'decode_utf8', 'encode_utf8';
   is $res->code, 200, 'OK';
   is decode_utf8($res->content), '<p>This is base-link action ♥ ♥</p>', 'correct body';
   is $res->content_length, 39, 'correct length';
+  is $res->content_charset, 'UTF-8';
 }
 
 {
@@ -155,6 +183,7 @@ use Encode 2.21 'decode_utf8', 'encode_utf8';
 
   is decode_utf8($res->content), '<p>This is base-link action ♥ ♥</p>', 'correct body';
   is $res->content_length, 39, 'correct length';
+  is $res->content_charset, 'UTF-8';
 }
 
 {
@@ -171,6 +200,7 @@ use Encode 2.21 'decode_utf8', 'encode_utf8';
     is $c->req->query_parameters->{'♥'}, '♥♥';
     is $c->req->body_parameters->{'♥'}, '♥♥';
     is $c->req->parameters->{'♥'}[0], '♥♥'; #combined with query and body
+    is $res->content_charset, 'UTF-8';
   }
 }
 
@@ -182,6 +212,7 @@ use Encode 2.21 'decode_utf8', 'encode_utf8';
   is decode_utf8($res->content), "$url", 'correct body'; #should do nothing
   is $res->content, "$url", 'correct body';
   is $res->content_length, 90, 'correct length';
+  is $res->content_charset, 'UTF-8';
 }
 
 {
@@ -189,7 +220,26 @@ use Encode 2.21 'decode_utf8', 'encode_utf8';
 
   is $res->code, 200, 'OK';
   is decode_utf8($res->content), '<p>This is stream_write action ♥</p>', 'correct body';
+  is $res->content_charset, 'UTF-8';
 }
 
+{
+  my $res = request "/root/stream_body_fh";
+
+  is $res->code, 200, 'OK';
+  is decode_utf8($res->content), "<p>This is stream_body_fh action ♥</p>\n", 'correct body';
+  is $res->content_charset, 'UTF-8';
+  # Not sure why there is a trailing newline above... its not in catalyst code I can see. Not sure
+  # if is a problem or just an artifact of the why the test stuff works - JNAP
+}
+
+{
+  my $res = request "/root/stream_write_fh";
+
+  is $res->code, 200, 'OK';
+  is decode_utf8($res->content), '<p>This is stream_write_fh action ♥</p>', 'correct body';
+  #is $res->content_length, 41, 'correct length';
+  is $res->content_charset, 'UTF-8';
+}
 
 done_testing;