From: Zbigniew Łukasiak <zbigniew@lukasiak.name>
Date: Tue, 17 Nov 2009 18:47:12 +0000 (+0000)
Subject: uri_for is now method of Catalyst::Context (fixes for t/aggregate/unit_core_uri_for.t)
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=c17f3e82b414112d1bfd70ef0a8aba6adf38eb45

uri_for is now method of Catalyst::Context (fixes for t/aggregate/unit_core_uri_for.t)
---

diff --git a/t/aggregate/unit_core_uri_for.t b/t/aggregate/unit_core_uri_for.t
index 170e91b..e0b4b35 100644
--- a/t/aggregate/unit_core_uri_for.t
+++ b/t/aggregate/unit_core_uri_for.t
@@ -10,68 +10,69 @@ my $request = Catalyst::Request->new( {
                 base => URI->new('http://127.0.0.1/foo')
               } );
 
-my $context = Catalyst->new( {
-                request => $request,
-                namespace => 'yada',
-              } );
+my $context = Catalyst::Context->new( 
+    request => $request, 
+    application => Catalyst->new,
+    namespace => 'yada',
+);
 
 is(
-    Catalyst::uri_for( $context, '/bar/baz' )->as_string,
+    $context->uri_for( '/bar/baz' )->as_string,
     'http://127.0.0.1/foo/bar/baz',
     'URI for absolute path'
 );
 
 is(
-    Catalyst::uri_for( $context, 'bar/baz' )->as_string,
+    $context->uri_for( 'bar/baz' )->as_string,
     'http://127.0.0.1/foo/yada/bar/baz',
     'URI for relative path'
 );
 
 is(
-    Catalyst::uri_for( $context, '', 'arg1', 'arg2' )->as_string,
+    $context->uri_for( '', 'arg1', 'arg2' )->as_string,
     'http://127.0.0.1/foo/yada/arg1/arg2',
     'URI for undef action with args'
 );
 
 
-is( Catalyst::uri_for( $context, '../quux' )->as_string,
+is( $context->uri_for( '../quux' )->as_string,
     'http://127.0.0.1/foo/quux', 'URI for relative dot path' );
 
 is(
-    Catalyst::uri_for( $context, 'quux', { param1 => 'value1' } )->as_string,
+    $context->uri_for( 'quux', { param1 => 'value1' } )->as_string,
     'http://127.0.0.1/foo/yada/quux?param1=value1',
     'URI for undef action with query params'
 );
 
-is (Catalyst::uri_for( $context, '/bar/wibble?' )->as_string,
+is ( $context->uri_for( '/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,
+is( $context->uri_for( 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,
+    $context->uri_for( '/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(
-    Catalyst::uri_for( $context, 'quux', { param1 => "\x{2620}" } )->as_string,
+    $context->uri_for( 'quux', { param1 => "\x{2620}" } )->as_string,
     'http://127.0.0.1/foo/yada/quux?param1=%E2%98%A0',
     'URI for undef action with query params in unicode'
 );
 is(
-    Catalyst::uri_for( $context, 'quux', { 'param:1' => "foo" } )->as_string,
+    $context->uri_for( 'quux', { 'param:1' => "foo" } )->as_string,
     'http://127.0.0.1/foo/yada/quux?param%3A1=foo',
     'URI for undef action with query params in unicode'
 );
 
 # test with object
 is(
-    Catalyst::uri_for( $context, 'quux', { param1 => $request->base } )->as_string,
+    $context->uri_for( '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'
 );
@@ -79,7 +80,7 @@ is(
 $request->base( URI->new('http://localhost:3000/') );
 $request->match( 'orderentry/contract' );
 is(
-    Catalyst::uri_for( $context, '/Orderentry/saveContract' )->as_string,
+    $context->uri_for( '/Orderentry/saveContract' )->as_string,
     'http://localhost:3000/Orderentry/saveContract',
     'URI for absolute path'
 );
@@ -89,11 +90,11 @@ is(
 
     $context->namespace('');
 
-    is( Catalyst::uri_for( $context, '/bar/baz' )->as_string,
+    is( $context->uri_for( '/bar/baz' )->as_string,
         'http://127.0.0.1/bar/baz', 'URI with no base or match' );
 
     # test "0" as the path
-    is( Catalyst::uri_for( $context, qw/0 foo/ )->as_string,
+    is( $context->uri_for( qw/0 foo/ )->as_string,
         'http://127.0.0.1/0/foo', '0 as path is ok'
     );
 
@@ -104,12 +105,12 @@ is(
     my $warnings = 0;
     local $SIG{__WARN__} = sub { $warnings++ };
 
-    Catalyst::uri_for( $context, '/bar/baz', { foo => undef } )->as_string,
+    $context->uri_for( '/bar/baz', { foo => undef } )->as_string,
     is( $warnings, 0, "no warnings emitted" );
 }
 
 # Test with parameters '/', 'foo', 'bar' - should not generate a //
-is( Catalyst::uri_for( $context, qw| / foo bar | )->as_string,
+is( $context->uri_for( qw| / foo bar | )->as_string,
     'http://127.0.0.1/foo/bar', 'uri is /foo/bar, not //foo/bar'
 );
 
@@ -119,7 +120,7 @@ TODO: {
     # according to the RFC, but it is a very big feature change so I've removed it
     no warnings; # Yes, everything in qw is sane
     is(
-        Catalyst::uri_for( $context, qw|! * ' ( ) ; : @ & = $ / ? % # [ ] ,|, )->as_string,
+        $context->uri_for( 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'
     );
@@ -127,7 +128,7 @@ TODO: {
     # 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,
+        $context->uri_for( qw|{1} {2}| )->as_string,
         'http://127.0.0.1/{1}/{2}',
         'not-escaping unreserved characters'
     );
@@ -139,7 +140,7 @@ TODO: {
                              bar  => ["foo baz", "bar"]};
     my $query_params_test = {test => "one two",
                              bar  => ["foo baz", "bar"]};
-    Catalyst::uri_for($context, '/bar/baz', $query_params_test);
+    $context->uri_for( '/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");
 }