X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Flib%2FTestApp%2FController%2FEngine%2FRequest%2FURI.pm;h=9b30152d4d346c10f571b0f2b4172ec339afc266;hp=44a21851757d61c3a783646bc61b0bd49a1518ae;hb=88e5a8b0c4d28e46b8ba6b6b9567063e57af9063;hpb=2f3812528068bc1d9f7840067f0c03d36cd47e6d

diff --git a/t/lib/TestApp/Controller/Engine/Request/URI.pm b/t/lib/TestApp/Controller/Engine/Request/URI.pm
index 44a2185..9b30152 100644
--- a/t/lib/TestApp/Controller/Engine/Request/URI.pm
+++ b/t/lib/TestApp/Controller/Engine/Request/URI.pm
@@ -1,30 +1,30 @@
 package TestApp::Controller::Engine::Request::URI;
 
 use strict;
-use base 'Catalyst::Base';
+use base 'Catalyst::Controller';
 
 sub default : Private {
     my ( $self, $c ) = @_;
-    
+
     $c->forward('TestApp::View::Dump::Request');
 }
 
 sub change_path : Local {
     my ( $self, $c ) = @_;
-    
+
     # change the path
     $c->req->path( '/my/app/lives/here' );
-    
+
     $c->forward('TestApp::View::Dump::Request');
 }
 
 sub change_base : Local {
     my ( $self, $c ) = @_;
-    
+
     # change the base and uri paths
     $c->req->base->path( '/new/location' );
     $c->req->uri->path( '/new/location/engine/request/uri/change_base' );
-    
+
     $c->forward('TestApp::View::Dump::Request');
 }
 
@@ -32,12 +32,14 @@ sub uri_with : Local {
     my ( $self, $c ) = @_;
 
     # change the current uri
-    my $uri   = $c->req->uri_with( { b => 1 } );
+    my $uri   = $c->req->uri_with( { b => 1, c => undef } );
     my %query = $uri->query_form;
-    
+
     $c->res->header( 'X-Catalyst-Param-a' => $query{ a } );
     $c->res->header( 'X-Catalyst-Param-b' => $query{ b } );
-    
+    $c->res->header( 'X-Catalyst-Param-c' => exists($query{ c }) ? $query{ c } : '--notexists--' );
+    $c->res->header( 'X-Catalyst-query' => $uri->query);
+
     $c->forward('TestApp::View::Dump::Request');
 }
 
@@ -46,9 +48,9 @@ sub uri_with_object : Local {
 
     my $uri   = $c->req->uri_with( { a => $c->req->base } );
     my %query = $uri->query_form;
-    
+
     $c->res->header( 'X-Catalyst-Param-a' => $query{ a } );
-    
+
     $c->forward('TestApp::View::Dump::Request');
 }
 
@@ -57,9 +59,9 @@ sub uri_with_utf8 : Local {
 
     # change the current uri
     my $uri = $c->req->uri_with( { unicode => "\x{2620}" } );
-    
+
     $c->res->header( 'X-Catalyst-uri-with' => "$uri" );
-    
+
     $c->forward('TestApp::View::Dump::Request');
 }
 
@@ -71,9 +73,9 @@ sub uri_with_undef : Local {
 
     # change the current uri
     my $uri = $c->req->uri_with( { foo => undef } );
-    
+
     $c->res->header( 'X-Catalyst-warnings' => $warnings );
-    
+
     $c->forward('TestApp::View::Dump::Request');
 }
 
@@ -81,7 +83,7 @@ sub uri_with_undef_only : Local {
     my ( $self, $c ) = @_;
 
     my $uri = $c->req->uri_with( { a => undef } );
-    
+
     $c->res->header( 'X-Catalyst-uri-with' => "$uri" );
     $c->forward('TestApp::View::Dump::Request');
 }
@@ -90,7 +92,7 @@ sub uri_with_undef_ignore : Local {
     my ( $self, $c ) = @_;
 
     my $uri = $c->req->uri_with( { a => 1, b => undef } );
-    
+
     my %query = $uri->query_form;
     $c->res->header( 'X-Catalyst-uri-with' => "$uri" );
     $c->res->header( 'X-Catalyst-Param-a' => $query{ a } );