From: Tomas Doran Date: Wed, 11 May 2011 12:34:51 +0000 (+0100) Subject: Re-space more sanely X-Git-Tag: 5.90003~20 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=9bdde4de9bedb3f4ebd9f90d2e79b27a00689038 Re-space more sanely --- diff --git a/t/aggregate/live_redirect_body.t b/t/aggregate/live_redirect_body.t index 135cb85..c7bb241 100644 --- a/t/aggregate/live_redirect_body.t +++ b/t/aggregate/live_redirect_body.t @@ -3,43 +3,46 @@ use lib "$FindBin::Bin/../lib"; use Catalyst::Test 'TestApp', {default_host => 'default.com'}; use Catalyst::Request; -use Test::More tests => 12; - - # test redirect - { - my $request = - HTTP::Request->new( GET => 'http://localhost:3000/test_redirect' ); - - ok( my $response = request($request), 'Request' ); - is( $response->code, 302, 'Response Code' ); - - # When no body and no content_type has been set, redirecting should set both. - is( $response->header( 'Content-Type' ), 'text/html; charset=utf-8', 'Content Type' ); - like( $response->content, qr//, 'Content contains HTML body' ); - } - - # test redirect without a body and but with a content_type set explicitly by the developer - { - my $request = - HTTP::Request->new( GET => 'http://localhost:3000/test_redirect_with_contenttype' ); - - ok( my $response = request($request), 'Request' ); - is( $response->code, 302, 'Response Code' ); - - # When the developer has not set content body, we set it. The content type must always match the body, so it should be overwritten. - is( $response->header( 'Content-Type' ), 'text/html; charset=utf-8', 'Content Type' ); - like( $response->content, qr//, 'Content contains HTML body' ); - } - - # test redirect without a body and but with a content_type set explicitly by the developer - { - my $request = - HTTP::Request->new( GET => 'http://localhost:3000/test_redirect_with_content' ); - - ok( my $response = request($request), 'Request' ); - is( $response->code, 302, 'Response Code' ); - - # When the developer sets both the content body and content type, the set content body and content_type should get through. - is( $response->header( 'Content-Type' ), 'text/plain', 'Content Type' ); - like( $response->content, qr/kind sir/, 'Content contains content set by the Controller' ); - } +use Test::More; + +# test redirect +{ + my $request = + HTTP::Request->new( GET => 'http://localhost:3000/test_redirect' ); + + ok( my $response = request($request), 'Request' ); + is( $response->code, 302, 'Response Code' ); + + # When no body and no content_type has been set, redirecting should set both. + is( $response->header( 'Content-Type' ), 'text/html; charset=utf-8', 'Content Type' ); + like( $response->content, qr//, 'Content contains HTML body' ); +} + +# test redirect without a body and but with a content_type set explicitly by the developer +{ + my $request = + HTTP::Request->new( GET => 'http://localhost:3000/test_redirect_with_contenttype' ); + + ok( my $response = request($request), 'Request' ); + is( $response->code, 302, 'Response Code' ); + + # When the developer has not set content body, we set it. The content type must always match the body, so it should be overwritten. + is( $response->header( 'Content-Type' ), 'text/html; charset=utf-8', 'Content Type' ); + like( $response->content, qr//, 'Content contains HTML body' ); +} + +# test redirect without a body and but with a content_type set explicitly by the developer +{ + my $request = + HTTP::Request->new( GET => 'http://localhost:3000/test_redirect_with_content' ); + + ok( my $response = request($request), 'Request' ); + is( $response->code, 302, 'Response Code' ); + + # When the developer sets both the content body and content type, the set content body and content_type should get through. + is( $response->header( 'Content-Type' ), 'text/plain', 'Content Type' ); + like( $response->content, qr/kind sir/, 'Content contains content set by the Controller' ); +} + +done_testing; +