X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Faggregate%2Flive_component_controller_action_index.t;h=48c6ec7dab8b7b759237c6ca1141d3f8251a461e;hb=4c71cf1b43594eabfee6e346a0a30b6dcf315b4f;hp=7cd24a9c2bec1f5bf6ed00ba64117e914a3c60c7;hpb=a0a66cb803a6ba6c0920c487e9c5d7fa148b7ec3;p=catagits%2FCatalyst-Runtime.git diff --git a/t/aggregate/live_component_controller_action_index.t b/t/aggregate/live_component_controller_action_index.t index 7cd24a9..48c6ec7 100644 --- a/t/aggregate/live_component_controller_action_index.t +++ b/t/aggregate/live_component_controller_action_index.t @@ -1,5 +1,3 @@ -#!perl - use strict; use warnings; @@ -30,37 +28,37 @@ sub run_tests { TestApp::Controller::Root->index TestApp::Controller::Root->end ]; - + my $expected = join( ", ", @expected ); ok( my $response = request('http://localhost/'), 'root index' ); is( $response->header('X-Catalyst-Executed'), $expected, 'Executed actions' ); is( $response->content, 'root index', 'root index ok' ); - + ok( $response = request('http://localhost'), 'root index no slash' ); is( $response->content, 'root index', 'root index no slash ok' ); } - + # test first-level controller index { my @expected = qw[ TestApp::Controller::Index->index TestApp::Controller::Root->end ]; - + my $expected = join( ", ", @expected ); - + ok( my $response = request('http://localhost/index/'), 'first-level controller index' ); is( $response->header('X-Catalyst-Executed'), $expected, 'Executed actions' ); is( $response->content, 'Index index', 'first-level controller index ok' ); - + ok( $response = request('http://localhost/index'), 'first-level controller index no slash' ); is( $response->header('X-Catalyst-Executed'), $expected, 'Executed actions' ); - is( $response->content, 'Index index', 'first-level controller index no slash ok' ); - } - + is( $response->content, 'Index index', 'first-level controller index no slash ok' ); + } + # test second-level controller index { my @expected = qw[ @@ -68,20 +66,20 @@ sub run_tests { TestApp::Controller::Action::Index->index TestApp::Controller::Root->end ]; - + my $expected = join( ", ", @expected ); - + ok( my $response = request('http://localhost/action/index/'), 'second-level controller index' ); is( $response->header('X-Catalyst-Executed'), $expected, 'Executed actions' ); is( $response->content, 'Action-Index index', 'second-level controller index ok' ); - + ok( $response = request('http://localhost/action/index'), 'second-level controller index no slash' ); is( $response->header('X-Catalyst-Executed'), $expected, 'Executed actions' ); - is( $response->content, 'Action-Index index', 'second-level controller index no slash ok' ); + is( $response->content, 'Action-Index index', 'second-level controller index no slash ok' ); } - + # test controller default when index is present { my @expected = qw[ @@ -89,9 +87,9 @@ sub run_tests { TestApp::Controller::Action::Index->default TestApp::Controller::Root->end ]; - + my $expected = join( ", ", @expected ); - + ok( my $response = request('http://localhost/action/index/foo'), 'default with index' ); is( $response->header('X-Catalyst-Executed'), $expected, 'Executed actions' );