X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fcatalyst-action-serialize-accept.t;h=90a4fe48e29b354dab046f43433d9cff4040ba42;hb=a51e7bbd48e4dd0c958549c3392690b00c3f2007;hp=176c5e9ae4ce813530f73b8bc7e08a987c61ab30;hpb=e601addaf89882fccbc824c1a53328f0d049b32b;p=catagits%2FCatalyst-Action-REST.git

diff --git a/t/catalyst-action-serialize-accept.t b/t/catalyst-action-serialize-accept.t
index 176c5e9..90a4fe4 100644
--- a/t/catalyst-action-serialize-accept.t
+++ b/t/catalyst-action-serialize-accept.t
@@ -14,9 +14,12 @@ use Catalyst;
 __PACKAGE__->config(
     name => 'Test::Catalyst::Action::Serialize',
     serialize => {
+        'default'   => 'text/x-yaml',
         'stash_key' => 'rest',
+        'content_type_stash_key' => 'serialize_content_type',
         'map'       => {
             'text/x-yaml'        => 'YAML',
+            'application/json'   => 'JSON',
             'text/x-data-dumper' => [ 'Data::Serializer', 'Data::Dumper' ],
             'text/broken'        => 'Broken',
         },
@@ -34,16 +37,18 @@ sub test :Local :ActionClass('Serialize') {
 
 sub test_second :Local :ActionClass('Serialize') {
     my ( $self, $c ) = @_;
+    $c->stash->{'serialize_content_type'} = $c->req->params->{'serialize_content_type'};
     $c->stash->{'rest'} = {
         lou => 'is my cat',
     };
 }
 
+
 package main;
 
 use strict;
 use warnings;
-use Test::More qw(no_plan);
+use Test::More tests => 16;
 use Data::Serializer;
 use FindBin;
 use Data::Dump qw(dump);
@@ -56,15 +61,75 @@ my $t = Test::Rest->new('content_type' => 'text/x-yaml');
 
 use_ok 'Catalyst::Test', 'Test::Catalyst::Action::Serialize';
 
-my $req = $t->get(url => '/test');
-$req->remove_header('Content-Type');
-$req->header('Accept', 'text/x-yaml');
-my $res = request($req);
-ok( $res->is_success, 'GET the serialized request succeeded' );
 my $data = <<EOH;
 --- 
 lou: is my cat
 EOH
-is( $res->content, $data, "Request returned proper data");
+
+{
+	my $req = $t->get(url => '/test');
+	$req->remove_header('Content-Type');
+	$req->header('Accept', 'text/x-yaml');
+	my $res = request($req);
+    SKIP: {
+        skip "can't test text/x-yaml without YAML support",
+        3 if ( 
+                not $res->is_success and 
+                $res->content =~ m#Content-Type text/x-yaml is not supported# 
+             );
+	    ok( $res->is_success, 'GET the serialized request succeeded' );
+	    is( $res->content, $data, "Request returned proper data");
+	    is( $res->header('Content-type'), 'text/x-yaml', '... with expected content-type')
+
+    };
+}
+
+SKIP: {
+    eval 'require JSON 2.12;';
+    skip "can't test application/json without JSON support", 3 if $@;
+    my $json = JSON->new;
+    my $at = Test::Rest->new('content_type' => 'text/doesnt-exist');
+	my $req = $at->get(url => '/test');
+	$req->header('Accept', 'application/json');
+	my $res = request($req);
+    ok( $res->is_success, 'GET the serialized request succeeded' );
+    my $ret = $json->decode($res->content);
+    is( $ret->{lou}, 'is my cat', "Request returned proper data");
+    is( $res->header('Content-type'), 'application/json', 'Accept header used if content-type mapping not found')
+};
+
+# Make sure we don't get a bogus content-type when using default
+# serializer (rt.cpan.org ticket 27949)
+{
+	my $req = $t->get(url => '/test');
+	$req->remove_header('Content-Type');
+	$req->header('Accept', '*/*');
+	my $res = request($req);
+	ok( $res->is_success, 'GET the serialized request succeeded' );
+	is( $res->content, $data, "Request returned proper data");
+	is( $res->header('Content-type'), 'text/x-yaml', '... with expected content-type')
+}
+
+# Make that using content_type_stash_key, an invalid value in the stash gets ignored
+{
+	my $req = $t->get(url => '/test_second?serialize_content_type=nonesuch');
+	$req->remove_header('Content-Type');
+	$req->header('Accept', '*/*');
+	my $res = request($req);
+	ok( $res->is_success, 'GET the serialized request succeeded' );
+	is( $res->content, $data, "Request returned proper data");
+	is( $res->header('Content-type'), 'text/x-yaml', '... with expected content-type')
+}
+
+# Make that using content_type_stash_key, a valid value in the stash gets priority
+{
+	my $req = $t->get(url => '/test_second?serialize_content_type=text/x-data-dumper');
+	$req->remove_header('Content-Type');
+	$req->header('Accept', '*/*');
+	my $res = request($req);
+	ok( $res->is_success, 'GET the serialized request succeeded' );
+	is( $res->content, "{'lou' => 'is my cat'}", "Request returned proper data");
+	is( $res->header('Content-type'), 'text/x-data-dumper', '... with expected content-type')
+}
 
 1;