use FindBin;
use lib "$FindBin::Bin/../lib";
-use Test::More tests => 68;
+use Test::More tests => 74;
use Catalyst::Test 'TestApp';
use Catalyst::Request;
{
ok( my $response = request('http://localhost/engine/request/uri/change_path'), 'Request' );
ok( $response->is_success, 'Response Successful 2xx' );
- ok( eval '$creq = ' . $response->content, 'Unserialize Catalyst::Request' );
+ ok( eval '$creq = ' . $response->content, 'Unserialize Catalyst::Request' )
+ or diag("Exception '$@', content " . $response->content);
like( $creq->uri, qr{/my/app/lives/here$}, 'URI contains new path' );
}
ok( $response->is_success, 'Response Successful 2xx' );
ok( !defined $response->header( 'X-Catalyst-Param-a' ), 'param "a" ok' );
is( $response->header( 'X-Catalyst-Param-b' ), '1', 'param "b" ok' );
+ is( $response->header( 'X-Catalyst-Param-c' ), '--notexists--', 'param "c" ok' );
+ unlike($response->header ('X-Catalyst-query'), qr/c=/, 'no c in return');
}
# test that uri_with adds params (and preserves)
ok( $response->is_success, 'Response Successful 2xx' );
is( $response->header( 'X-Catalyst-Param-a' ), '1', 'param "a" ok' );
is( $response->header( 'X-Catalyst-Param-b' ), '1', 'param "b" ok' );
+ is( $response->header( 'X-Catalyst-Param-c' ), '--notexists--', 'param "c" ok' );
+ unlike($response->header ('X-Catalyst-query'), qr/c=/, 'no c in return');
}
# test that uri_with replaces params (and preserves)
{
- ok( my $response = request('http://localhost/engine/request/uri/uri_with?a=1&b=2'), 'Request' );
+ ok( my $response = request('http://localhost/engine/request/uri/uri_with?a=1&b=2&c=3'), 'Request' );
ok( $response->is_success, 'Response Successful 2xx' );
is( $response->header( 'X-Catalyst-Param-a' ), '1', 'param "a" ok' );
is( $response->header( 'X-Catalyst-Param-b' ), '1', 'param "b" ok' );
+ is( $response->header( 'X-Catalyst-Param-c' ), '--notexists--', 'param "c" deleted ok' );
+ unlike($response->header ('X-Catalyst-query'), qr/c=/, 'no c in return');
}
# test that uri_with replaces params (and preserves)
# 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' );
is( $response->header( 'X-Catalyst-Param-c' ), '1', 'param "c" ok' );
}
-SKIP: {
- skip 'This currently causes infinite recursion', 2;
+# 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');
}
-