Warning in uri_for

[catagits/Catalyst-Runtime.git] / t / unit_core_uri_for.t

diff --git a/t/unit_core_uri_for.t b/t/unit_core_uri_for.t
index 2fb1421..612d0b0 100644 (file)
--- a/t/unit_core_uri_for.t
+++ b/t/unit_core_uri_for.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 9;
+use Test::More tests => 13;
 use URI;
 
 use_ok('Catalyst');
@@ -43,6 +43,15 @@ is(
     'URI for undef action with query params'
 );
 
+is (Catalyst::uri_for( $context, '/bar/wibble?' )->as_string,
+   'http://127.0.0.1/foo/bar/wibble%3F', 'Question Mark gets encoded'
+);
+   
+is( Catalyst::uri_for( $context, qw/bar wibble?/, 'with space' )->as_string,
+    'http://127.0.0.1/foo/yada/bar/wibble%3F/with%20space', 'Space gets encoded'
+);
+
+
 # test with utf-8
 is(
     Catalyst::uri_for( $context, 'quux', { param1 => "\x{2620}" } )->as_string,
@@ -50,6 +59,13 @@ is(
     'URI for undef action with query params in unicode'
 );
 
+# test with object
+is(
+    Catalyst::uri_for( $context, 'quux', { param1 => $request->base } )->as_string,
+    'http://127.0.0.1/foo/yada/quux?param1=http%3A%2F%2F127.0.0.1%2Ffoo',
+    'URI for undef action with query param as object'
+);
+
 $request->base( URI->new('http://localhost:3000/') );
 $request->match( 'orderentry/contract' );
 is(
@@ -67,3 +83,12 @@ is(
         'http://127.0.0.1/bar/baz', 'URI with no base or match' );
 }
 
+# test with undef -- no warnings should be thrown
+{
+    my $warnings = 0;
+    local $SIG{__WARN__} = sub { $warnings++ };
+
+    Catalyst::uri_for( $context, '/bar/baz', { foo => undef } )->as_string,
+    is( $warnings, 0, "no warnings emitted" );
+}
+