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

diff --git a/t/catalyst-action-serialize.t b/t/catalyst-action-serialize.t
index 98ac990..295f088 100644
--- a/t/catalyst-action-serialize.t
+++ b/t/catalyst-action-serialize.t
@@ -1,79 +1,51 @@
-package Test::Catalyst::Action::Serialize;
-
-use FindBin;
-
-use lib ("$FindBin::Bin/../lib");
-
 use strict;
 use warnings;
 
-use Catalyst::Runtime '5.70';
-
-use Catalyst;
-
-__PACKAGE__->config(
-    name => 'Test::Catalyst::Action::Serialize',
-    serialize => {
-        'default'   => 'YAML',
-        'stash_key' => 'rest',
-        'map'       => {
-            'text/x-yaml'        => 'YAML',
-            'text/x-data-dumper' => [ 'Data::Serializer', 'Data::Dumper' ],
-            'text/broken'        => 'Broken',
-        },
-    }
-);
-
-__PACKAGE__->setup;
-
-sub test :Local :ActionClass('Serialize') {
-    my ( $self, $c ) = @_;
-    $c->stash->{'rest'} = {
-        lou => 'is my cat',
-    };
-}
-
-sub test_second :Local :ActionClass('Serialize') {
-    my ( $self, $c ) = @_;
-    $c->stash->{'rest'} = {
-        lou => 'is my cat',
-    };
-}
-
-package main;
-
-use strict;
-use warnings;
-use Test::More qw(no_plan);
-use Data::Serializer;
+use Test::More 0.88;
+use Test::Requires qw(YAML::Syck);
 use FindBin;
-use Data::Dump qw(dump);
 
 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::Serialize';
+use_ok 'Catalyst::Test', 'Test::Catalyst::Action::REST';
 
-my $res = request($t->get(url => '/test'));
+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 => '/test'));
+my $bres = request($nt->get(url => '/serialize/test'));
 is( $bres->code, 415, 'GET on un-useable Serialize class returns 415');
 
 my $ut = Test::Rest->new('content_type' => 'text/not-happening');
-my $ures = request($ut->get(url => '/test'));
+my $ures = request($ut->get(url => '/serialize/test'));
 is ($bres->code, 415, 'GET on unknown Content-Type returns 415');
 
 # This check is to make sure we can still serialize after the first
 # request.
-my $res2 = request($t->get(url => '/test_second'));
+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;