X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Faggregate%2Flive_engine_request_env.t;h=48aa52bf2e1bf82f48acf8b232e5b4d3368a43a6;hp=6d3e3e99caf54bcfa147577f881ad07afc6d495e;hb=88e5a8b0c4d28e46b8ba6b6b9567063e57af9063;hpb=faa02805570aed25eec5879f9a9383c5b16fb3cd diff --git a/t/aggregate/live_engine_request_env.t b/t/aggregate/live_engine_request_env.t index 6d3e3e9..48aa52b 100644 --- a/t/aggregate/live_engine_request_env.t +++ b/t/aggregate/live_engine_request_env.t @@ -1,5 +1,3 @@ -#!perl - use strict; use warnings; @@ -12,7 +10,7 @@ use vars qw/ /; BEGIN { - $EXPECTED_ENV_VAR = "CATALYSTTEST$$"; # has to be uppercase otherwise fails on Win32 + $EXPECTED_ENV_VAR = "CATALYSTTEST$$"; # has to be uppercase otherwise fails on Win32 $EXPECTED_ENV_VAL = "Test env value " . rand(100000); } @@ -23,28 +21,26 @@ use Catalyst::Request; use HTTP::Headers; use HTTP::Request::Common; -foreach my $path (qw/ env env_on_engine /) { - my $response = request("http://localhost/dump/${path}", { - extra_env => { $EXPECTED_ENV_VAR => $EXPECTED_ENV_VAL }, - }); - - ok( $response, 'Request' ); - ok( $response->is_success, 'Response Successful 2xx' ); - is( $response->content_type, 'text/plain', 'Response Content-Type' ); - - my $env; - ok( eval '$env = ' . $response->content, 'Unserialize Catalyst::Request' ); - is ref($env), 'HASH'; - ok exists($env->{PATH_INFO}), 'Have a PATH_INFO env var for ' . $path; - - SKIP: - { - if ( $ENV{CATALYST_SERVER} ) { - skip 'Using remote server', 1; - } - is $env->{$EXPECTED_ENV_VAR}, $EXPECTED_ENV_VAL, - 'Value we set as expected for ' . $path; +my $response = request("http://localhost/dump/env", { + extra_env => { $EXPECTED_ENV_VAR => $EXPECTED_ENV_VAL }, +}); + +ok( $response, 'Request' ); +ok( $response->is_success, 'Response Successful 2xx' ); +is( $response->content_type, 'text/plain', 'Response Content-Type' ); + +my $env; +ok( eval '$env = ' . $response->content, 'Unserialize Catalyst::Request' ); +is ref($env), 'HASH'; +ok exists($env->{PATH_INFO}), 'Have a PATH_INFO env var for dump/env'; + +SKIP: +{ + if ( $ENV{CATALYST_SERVER} ) { + skip 'Using remote server', 1; } + is $env->{$EXPECTED_ENV_VAR}, $EXPECTED_ENV_VAL, + 'Value we set as expected for /dump/env' } done_testing;