X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Faggregate%2Flive_engine_request_uri.t;h=4f60c49b5228b13e00572ac30e608d8d05f7e76b;hb=4fbc0e853c0b29d1f6082909b0cb54595ea32787;hp=7d1628d312cd2175cfcdfa5258319b9c61141ac9;hpb=42da66a91b0a87ebb81d8552bcd0b05d3557c83e;p=catagits%2FCatalyst-Runtime.git diff --git a/t/aggregate/live_engine_request_uri.t b/t/aggregate/live_engine_request_uri.t index 7d1628d..4f60c49 100644 --- a/t/aggregate/live_engine_request_uri.t +++ b/t/aggregate/live_engine_request_uri.t @@ -4,7 +4,7 @@ use warnings; use FindBin; use lib "$FindBin::Bin/../lib"; -use Test::More tests => 66; +use Test::More tests => 68; use Catalyst::Test 'TestApp'; use Catalyst::Request; @@ -121,27 +121,31 @@ SKIP: # more tests with undef - should be ignored { my $uri = "http://localhost/engine/request/uri/uri_with_undef_only"; + my ($check) = $uri =~ m{^http://localhost(.+)}; # needed to work with remote servers ok( my $response = request($uri), 'Request' ); ok( $response->is_success, 'Response Successful 2xx' ); - is( $response->header( 'X-Catalyst-uri-with' ), $uri, 'uri_with ok' ); + like( $response->header( 'X-Catalyst-uri-with' ), qr/$check$/, 'uri_with ok' ); # try with existing param $uri = "$uri?x=1"; + ($check) = $uri =~ m{^http://localhost(.+)}; # needed to work with remote servers + $check =~ s/\?/\\\?/g; ok( $response = request($uri), 'Request' ); ok( $response->is_success, 'Response Successful 2xx' ); - is( $response->header( 'X-Catalyst-uri-with' ), $uri, 'uri_with ok' ); + like( $response->header( 'X-Catalyst-uri-with' ), qr/$check$/, 'uri_with ok' ); } { my $uri = "http://localhost/engine/request/uri/uri_with_undef_ignore"; + my ($check) = $uri =~ m{^http://localhost(.+)}; # needed to work with remote servers ok( my $response = request($uri), 'Request' ); ok( $response->is_success, 'Response Successful 2xx' ); - is( $response->header( 'X-Catalyst-uri-with' ), "${uri}?a=1", 'uri_with ok' ); + like( $response->header( 'X-Catalyst-uri-with' ), qr/$check\?a=1/, 'uri_with ok' ); # remove an existing param ok( $response = request("${uri}?b=1"), 'Request' ); ok( $response->is_success, 'Response Successful 2xx' ); - is( $response->header( 'X-Catalyst-uri-with' ), "${uri}?a=1", 'uri_with ok' ); + like( $response->header( 'X-Catalyst-uri-with' ), qr/$check\?a=1/, 'uri_with ok' ); # remove an existing param, leave one, and add a new one ok( $response = request("${uri}?b=1&c=1"), 'Request' ); @@ -151,3 +155,16 @@ SKIP: is( $response->header( 'X-Catalyst-Param-c' ), '1', 'param "c" ok' ); } +# Test an overridden uri method which calls the base method, SmartURI does this. +SKIP: +{ + if ( $ENV{CATALYST_SERVER} ) { + skip 'Using remote server', 2; + } + + require TestApp::RequestBaseBug; + TestApp->request_class('TestApp::RequestBaseBug'); + ok( my $response = request('http://localhost/engine/request/uri'), 'Request' ); + ok( $response->is_success, 'Response Successful 2xx' ); + TestApp->request_class('Catalyst::Request'); +}