X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Funit_core_uri_for.t;h=3dd3a69370e04fa488092de1dbc51bd93549bc34;hb=1f851263ba70ba7d398ed19b45eaaca482f5aaa3;hp=d5902b045983a51a7cc9154599850d09a714cf24;hpb=1b5227a1e97178b42438f8187a09dade7236015a;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/unit_core_uri_for.t b/t/unit_core_uri_for.t
index d5902b0..3dd3a69 100644
--- 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 => 16;
+use Test::More tests => 20;
 use URI;
 
 use_ok('Catalyst');
@@ -51,6 +51,11 @@ 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'
 );
 
+is(
+    Catalyst::uri_for( $context, '/bar', 'with+plus', { 'also' => 'with+plus' })->as_string,
+    'http://127.0.0.1/foo/bar/with+plus?also=with%2Bplus',
+    'Plus is not encoded'
+);
 
 # test with utf-8
 is(
@@ -108,18 +113,33 @@ is( Catalyst::uri_for( $context, qw| / foo bar | )->as_string,
     'http://127.0.0.1/foo/bar', 'uri is /foo/bar, not //foo/bar'
 );
 
-if ( 0 ) {
+TODO: {
+    local $TODO = 'RFCs are for people who, erm - fix this test..';
     # Test rfc3986 reserved characters.  These characters should all be escaped
     # according to the RFC, but it is a very big feature change so I've removed it
-    is( 
-        Catalyst::uri_for( $context, qw|! * ' ( ) ; : @ & = $ , / ? % # [ ]| )->as_string,
+    no warnings; # Yes, everything in qw is sane
+    is(
+        Catalyst::uri_for( $context, qw|! * ' ( ) ; : @ & = $ / ? % # [ ] ,|, )->as_string,
         'http://127.0.0.1/%21/%2A/%27/%2B/%29/%3B/%3A/%40/%26/%3D/%24/%2C/%2F/%3F/%25/%23/%5B/%5D',
         'rfc 3986 reserved characters'
     );
+
+    # jshirley bug - why the hell does only one of these get encoded
+    #                has been like this forever however.
+    is(
+        Catalyst::uri_for( $context, qw|{1} {2}| )->as_string,
+        'http://127.0.0.1/{1}/{2}',
+        'not-escaping unreserved characters'
+    );
 }
 
-is( 
-    Catalyst::uri_for( $context, qw|{1} {2}| )->as_string,
-    'http://127.0.0.1/{1}/{2}',
-    'not-escaping unreserved characters'
-);
+# make sure caller's query parameter hash isn't messed up
+{
+    my $query_params_base = {test => "one two",
+                             bar  => ["foo baz", "bar"]};
+    my $query_params_test = {test => "one two",
+                             bar  => ["foo baz", "bar"]};
+    Catalyst::uri_for($context, '/bar/baz', $query_params_test);
+    is_deeply($query_params_base, $query_params_test,
+              "uri_for() doesn't mess up query parameter hash in the caller");
+}