X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fcatalyst-action-serialize-accept.t;h=8f5a38f469467f21a4be192dad16f5125ff9d8e0;hb=f789417d081b4d519ded07eec046c0b01661e25d;hp=12f5df633ace56bd464eabeec1e001498904c138;hpb=c0aef9cd678b6b4e4ea557d7fa1e8f43153e00b0;p=catagits%2FCatalyst-Action-REST.git diff --git a/t/catalyst-action-serialize-accept.t b/t/catalyst-action-serialize-accept.t index 12f5df6..8f5a38f 100644 --- a/t/catalyst-action-serialize-accept.t +++ b/t/catalyst-action-serialize-accept.t @@ -1,100 +1,86 @@ -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' => 'text/x-yaml', - 'stash_key' => 'rest', - 'map' => { - 'text/x-yaml' => 'YAML', - 'application/json' => 'JSON', - '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 tests => 10; -use Data::Serializer; +use Test::More; use FindBin; -use Data::Dump qw(dump); -use JSON::Syck; +use Test::Requires qw(YAML::Syck); use lib ("$FindBin::Bin/lib", "$FindBin::Bin/../lib", "$FindBin::Bin/broken"); use Test::Rest; +use Catalyst::Action::Serialize::YAML; -# Should use Data::Dumper, via YAML +# Should use Data::Dumper, via YAML 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 $data = <serialize({lou => 'is my cat'}); { - 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' ); - is( $res->content, $data, "Request returned proper data"); - is( $res->header('Content-type'), 'text/x-yaml', '... with expected content-type') + my $req = $t->get(url => '/serialize/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, $output_YAML, "Request returned proper data"); + is( $res->content_type, 'text/x-yaml', '... with expected content-type') + + }; +} + +SKIP: { + eval 'use 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 => '/serialize/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->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 the default +# serializer (https://rt.cpan.org/Ticket/Display.html?id=27949) +{ + my $req = $t->get(url => '/serialize/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, $output_YAML, "Request returned proper data"); + is( $res->content_type, 'text/x-yaml', '... with expected content-type') } +# Make sure that when using content_type_stash_key, an invalid value in the stash gets ignored { - 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::Syck::Load($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') + my $req = $t->get(url => '/serialize/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, $output_YAML, "Request returned proper data"); + is( $res->content_type, 'text/x-yaml', '... with expected content-type') } -# Make sure we don't get a bogus content-type when using default -# serializer (rt.cpan.org ticket 27949) +# Make sure that the default content type you specify really gets used. { - 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') + my $req = $t->get(url => '/override/test'); + $req->remove_header('Content-Type'); + my $res = request($req); + ok( $res->is_success, 'GET the serialized request succeeded' ); + is( $res->content, "--- \nlou: is my cat\n", "Request returned proper data"); } -1; +done_testing; +