From: Sebastian Riedel Date: Wed, 12 Oct 2005 19:30:41 +0000 (+0000) Subject: Fixed test X-Git-Tag: 5.7099_04~1214 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=40392ee98f45416e9b2fb18b80ea994dc1194d72 Fixed test --- diff --git a/t/live/component/controller/action/forward.t b/t/live/component/controller/action/forward.t index a68f291..6a991ee 100644 --- a/t/live/component/controller/action/forward.t +++ b/t/live/component/controller/action/forward.t @@ -9,81 +9,121 @@ use lib "$FindBin::Bin/../../../lib"; use Test::More tests => 30; use Catalyst::Test 'TestApp'; - { my @expected = qw[ - TestApp::Controller::Action::Forward->begin - TestApp::Controller::Action::Forward->one - TestApp::Controller::Action::Forward->two - TestApp::Controller::Action::Forward->three - TestApp::Controller::Action::Forward->four - TestApp::Controller::Action::Forward->five - TestApp::View::Dump::Request->process + TestApp::Controller::Action::Forward->begin + TestApp::Controller::Action::Forward->one + TestApp::Controller::Action::Forward->two + TestApp::Controller::Action::Forward->three + TestApp::Controller::Action::Forward->four + TestApp::Controller::Action::Forward->five + TestApp::View::Dump::Request->process ]; my $expected = join( ", ", @expected ); - # Test forward to global private action - ok( my $response = request('http://localhost/action/forward/global'), 'Request' ); + # Test forward to global private action + ok( my $response = request('http://localhost/action/forward/global'), + 'Request' ); ok( $response->is_success, 'Response Successful 2xx' ); is( $response->content_type, 'text/plain', 'Response Content-Type' ); - is( $response->header('X-Catalyst-Action'), 'action/forward/global', 'Main Class Action' ); + is( $response->header('X-Catalyst-Action'), + 'action/forward/global', 'Main Class Action' ); + # Test forward to chain of actions. ok( $response = request('http://localhost/action/forward/one'), 'Request' ); ok( $response->is_success, 'Response Successful 2xx' ); is( $response->content_type, 'text/plain', 'Response Content-Type' ); - is( $response->header('X-Catalyst-Action'), 'action/forward/one', 'Test Action' ); - is( $response->header('X-Test-Class'), 'TestApp::Controller::Action::Forward', 'Test Class' ); - is( $response->header('X-Catalyst-Executed'), $expected, 'Executed actions' ); - like( $response->content, qr/^bless\( .* 'Catalyst::Request' \)$/s, 'Content is a serialized Catalyst::Request' ); + is( $response->header('X-Catalyst-Action'), + 'action/forward/one', 'Test Action' ); + is( + $response->header('X-Test-Class'), + 'TestApp::Controller::Action::Forward', + 'Test Class' + ); + is( $response->header('X-Catalyst-Executed'), + $expected, 'Executed actions' ); + like( + $response->content, + qr/^bless\( .* 'Catalyst::Request' \)$/s, + 'Content is a serialized Catalyst::Request' + ); } { my @expected = qw[ - TestApp::Controller::Action::Forward->begin - TestApp::Controller::Action::Forward->jojo - TestApp::Controller::Action::Forward->one - TestApp::Controller::Action::Forward->two - TestApp::Controller::Action::Forward->three - TestApp::Controller::Action::Forward->four - TestApp::Controller::Action::Forward->five - TestApp::View::Dump::Request->process - TestApp::Controller::Action::Forward->three - TestApp::Controller::Action::Forward->four - TestApp::Controller::Action::Forward->five - TestApp::View::Dump::Request->process + TestApp::Controller::Action::Forward->begin + TestApp::Controller::Action::Forward->jojo + TestApp::Controller::Action::Forward->one + TestApp::Controller::Action::Forward->two + TestApp::Controller::Action::Forward->three + TestApp::Controller::Action::Forward->four + TestApp::Controller::Action::Forward->five + TestApp::View::Dump::Request->process + TestApp::Controller::Action::Forward->three + TestApp::Controller::Action::Forward->four + TestApp::Controller::Action::Forward->five + TestApp::View::Dump::Request->process ]; my $expected = join( ", ", @expected ); - ok( my $response = request('http://localhost/action/forward/jojo'), 'Request' ); + ok( my $response = request('http://localhost/action/forward/jojo'), + 'Request' ); ok( $response->is_success, 'Response Successful 2xx' ); is( $response->content_type, 'text/plain', 'Response Content-Type' ); - is( $response->header('X-Catalyst-Action'), 'action/forward/jojo', 'Test Action' ); - is( $response->header('X-Test-Class'), 'TestApp::Controller::Action::Forward', 'Test Class' ); - is( $response->header('X-Catalyst-Executed'), $expected, 'Executed actions' ); - like( $response->content, qr/^bless\( .* 'Catalyst::Request' \)$/s, 'Content is a serialized Catalyst::Request' ); + is( $response->header('X-Catalyst-Action'), + 'action/forward/jojo', 'Test Action' ); + is( + $response->header('X-Test-Class'), + 'TestApp::Controller::Action::Forward', + 'Test Class' + ); + is( $response->header('X-Catalyst-Executed'), + $expected, 'Executed actions' ); + like( + $response->content, + qr/^bless\( .* 'Catalyst::Request' \)$/s, + 'Content is a serialized Catalyst::Request' + ); } { - ok( my $response = request('http://localhost/action/forward/with_args/old'), 'Request with args' ); + ok( + my $response = request('http://localhost/action/forward/with_args/old'), + 'Request with args' + ); ok( $response->is_success, 'Response Successful 2xx' ); is( $response->content, 'old' ); } { - ok( my $response = request('http://localhost/action/forward/with_method_and_args/old'), 'Request with args and method' ); + ok( + my $response = + request('http://localhost/action/forward/with_method_and_args/old'), + 'Request with args and method' + ); ok( $response->is_success, 'Response Successful 2xx' ); is( $response->content, 'old' ); } # test forward with embedded args { - ok( my $response = request('http://localhost/action/forward/args_embed_relative'), 'Request' ); + ok( + my $response = + request('http://localhost/action/forward/args_embed_relative'), + 'Request' + ); ok( $response->is_success, 'Response Successful 2xx' ); - is( $response->content, 'ok' ); - - ok( my $response = request('http://localhost/action/forward/args_embed_absolute'), 'Request' ); + is( $response->content, 'ok' ); +} + +{ + ok( + my $response = + request('http://localhost/action/forward/args_embed_absolute'), + 'Request' + ); ok( $response->is_success, 'Response Successful 2xx' ); is( $response->content, 'ok' ); }