From: John Napiorkowski Date: Thu, 7 Aug 2014 15:11:40 +0000 (-0400) Subject: we no longer need this test X-Git-Tag: 5.90070~4 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=501860b226f5c62a542d4e2def85585943a9aacd we no longer need this test --- diff --git a/t/aggregate/live_engine_request_env.t b/t/aggregate/live_engine_request_env.t index ecc2a0b..5e7e4c6 100644 --- a/t/aggregate/live_engine_request_env.t +++ b/t/aggregate/live_engine_request_env.t @@ -21,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; diff --git a/t/lib/TestApp/Controller/Dump.pm b/t/lib/TestApp/Controller/Dump.pm index bcf13bd..e0a1a2d 100644 --- a/t/lib/TestApp/Controller/Dump.pm +++ b/t/lib/TestApp/Controller/Dump.pm @@ -14,14 +14,6 @@ sub env : Action Relative { $c->forward('TestApp::View::Dump::Env'); } -sub env_on_engine : Action Relative { - my ( $self, $c ) = @_; - # JNAP - I changed this to req since the engine no longer - # has the env but the tests here are useful. - $c->stash(env => $c->req->env); - $c->forward('TestApp::View::Dump::Env'); -} - sub request : Action Relative { my ( $self, $c ) = @_; $c->req->params(undef); # Should be a no-op, and be ignored.