X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fcatalyst-action-serialize.t;h=0b0fb2c6192f5708688c2246cb5063cfe9f204eb;hb=1bb213fc84712fcc13431f4e48b0d0ad74aa7dc3;hp=43d793d08408e76adf1ed501dbbab109001e996f;hpb=467b1ade0c03900ad39bfdea1ad01bd67cf8f8d8;p=catagits%2FCatalyst-Action-REST.git

diff --git a/t/catalyst-action-serialize.t b/t/catalyst-action-serialize.t
index 43d793d..0b0fb2c 100644
--- a/t/catalyst-action-serialize.t
+++ b/t/catalyst-action-serialize.t
@@ -1,20 +1,20 @@
 use strict;
 use warnings;
-use Test::More tests => 11;
+
+use Test::More 0.88;
 use Data::Serializer;
 use FindBin;
 
 use lib ("$FindBin::Bin/lib", "$FindBin::Bin/../lib", "$FindBin::Bin/broken");
 use Test::Rest;
 
-# Should use Data::Dumper, via YAML 
-my $t = Test::Rest->new('content_type' => 'text/x-data-dumper');
+my $t = Test::Rest->new('content_type' => 'application/json');
 
 use_ok 'Catalyst::Test', 'Test::Catalyst::Action::REST';
 
 my $res = request($t->get(url => '/serialize/test'));
 ok( $res->is_success, 'GET the serialized request succeeded' );
-is( $res->content, "{'lou' => 'is my cat'}", "Request returned proper data");
+is( $res->content, '{"lou":"is my cat"}', "Request returned proper data");
 
 my $nt = Test::Rest->new('content_type' => 'text/broken');
 my $bres = request($nt->get(url => '/serialize/test'));
@@ -28,15 +28,24 @@ is ($bres->code, 415, 'GET on unknown Content-Type returns 415');
 # request.
 my $res2 = request($t->get(url => '/serialize/test_second'));
 ok( $res2->is_success, '2nd request succeeded' );
-is( $res2->content, "{'lou' => 'is my cat'}", "2nd request returned proper data");
+is( $res2->content,'{"lou":"is my cat"}', "2nd request returned proper data");
 
 Test::Catalyst::Action::REST->controller('Serialize')->{serialize} = {};
 $res2 = request($t->get(url => '/serialize/test_second'));
 ok( $res2->is_success, 'request succeeded (deprecated config)' );
-is( $res2->content, "{'lou' => 'is my cat'}", "request returned proper data");
+is( $res2->content,'{"lou":"is my cat"}', "request returned proper data");
+
+
+$res = request($t->get(url => '/serialize/empty_serialized'));
+is $res->content, q[{"foo":"bar"}], 'normal case ok';
+ok $res->header('Content-Length'), 'set content-length when we serialize';
+
+$res = request($t->get(url => '/serialize/empty_not_serialized_blank'));
+is $res->content, '', "body explicitly set to '' results in '' content";
+ok !$res->header('Content-Length'), "body explicitly set to '' - no automatic content-length";
 
-my $emptyres = request($t->get(url => '/serialize/empty'));
-is $emptyres->content, '';
-ok !$emptyres->header('Content-Length');
+$res = request($t->get(url => '/serialize/explicit_view'));
+is $res->content, '', "view explicitly set to '' results in '' content";
+ok !$res->header('Content-Length'), "view explicitly set to '' - no automatic content-length";
 
-1;
+done_testing;