From: Tomas Doran Date: Mon, 30 Nov 2009 20:44:16 +0000 (+0000) Subject: And yea, these test cases now pass X-Git-Tag: 5.80014_02~7 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=a0d17f88492e2f5929aaeade9eab441adde68a74 And yea, these test cases now pass --- diff --git a/t/aggregate/live_engine_request_escaped_path.t b/t/aggregate/live_engine_request_escaped_path.t index 0512e6a..fca5a05 100644 --- a/t/aggregate/live_engine_request_escaped_path.t +++ b/t/aggregate/live_engine_request_escaped_path.t @@ -13,7 +13,7 @@ use HTTP::Request::AsCGI; This test exposes a problem in the handling of PATH_INFO in C::Engine::CGI (and other engines) where Catalyst does not un-escape the request correctly. -If a request is URL-encoded then Catalyst fails to decode the request +If a request is URL-encoded then Catalyst fails to decode the request and thus will try and match actions using the URL-encoded value. Can NOT use Catalyst::Test as it uses HTTP::Request::AsCGI which does @@ -31,11 +31,11 @@ Index: lib/Catalyst/Engine/CGI.pm @@ -157,6 +157,8 @@ my $query = $ENV{QUERY_STRING} ? '?' . $ENV{QUERY_STRING} : ''; my $uri = $scheme . '://' . $host . '/' . $path . $query; - + + $uri = URI->new( $uri )->canonical; + $c->request->uri( bless \$uri, $uri_class ); - + # set the base URI =cut @@ -54,6 +54,7 @@ Index: lib/Catalyst/Engine/CGI.pm } # test that request with URL-escaped code works. +{ my $request = Catalyst::Utils::request( 'http://localhost/args/param%73/one/two' ); my $cgi = HTTP::Request::AsCGI->new( $request, %ENV )->setup; @@ -65,8 +66,6 @@ Index: lib/Catalyst/Engine/CGI.pm TestApp->handle_request( env => \%ENV ); ok( my $response = $cgi->restore->response ); -TODO: { - local $TODO = 'Actions should match when path parts are url encoded'; ok( $response->is_success, 'Response Successful 2xx' ); is( $response->content, 'onetwo' ); }