X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fcatalyst-action-serialize.t;h=295f08842276e274f635b182724c972c7a6603ee;hb=801ec3794e6db697855a04243e056c04cbc0aad2;hp=b3554408cba3e1916cee0a9a7e7239253cbe612d;hpb=de1fb650378975cfcafe60e7b9a031825df7392e;p=catagits%2FCatalyst-Action-REST.git

diff --git a/t/catalyst-action-serialize.t b/t/catalyst-action-serialize.t
index b355440..295f088 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 => 7;
-use Data::Serializer;
+
+use Test::More 0.88;
+use Test::Requires qw(YAML::Syck);
 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' => 'text/x-yaml');
 
 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, "--- \nlou: is my cat\n", "Request returned proper data");
 
 my $nt = Test::Rest->new('content_type' => 'text/broken');
 my $bres = request($nt->get(url => '/serialize/test'));
@@ -28,7 +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, "--- \nlou: is my cat\n", "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, "--- \nlou: is my cat\n", "request returned proper data");
+
+
+$res = request($t->get(url => '/serialize/empty_serialized'));
+is $res->content, "--- \nfoo: bar\n", '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";
 
+$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;