From: Jos Boumans Date: Fri, 20 Mar 2009 15:47:40 +0000 (+0000) Subject: rename crequest to ctx_request on request of #cat-dev X-Git-Tag: 5.71001~8 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=f2e13bbd72d59b71fe8916aa802d2631217bd51d rename crequest to ctx_request on request of #cat-dev fix docs & tests add a note in the changelog about it --- diff --git a/Changes b/Changes index 65da53e..e1e41b5 100644 --- a/Changes +++ b/Changes @@ -6,6 +6,8 @@ - Support Moose components so that attribute defaults work and BUILD methods are correctly called (t0m) - Add tests for this (Florian Ragwitz) + - Added Catalyst::Test::ctx_request to be able to inspect + the context object after a request is made (Jos Boumans) 5.71000 2009-01-19 17:50:00 - Text::SimpleTable's go as wide as $ENV{COLUMNS} (jhannah) diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm index d6f80c5..db79ba6 100644 --- a/lib/Catalyst/Test.pm +++ b/lib/Catalyst/Test.pm @@ -20,7 +20,7 @@ Catalyst::Test - Test Catalyst Applications use Catalyst::Test 'TestApp'; my $content = get('index.html'); # Content as string my $response = request('index.html'); # HTTP::Response object - my($res, $c) = crequest('index.html'); # HTTP::Response & context object + my($res, $c) = ctx_request('index.html'); # HTTP::Response & context object use HTTP::Request::Common; my $response = request POST '/foo', [ @@ -87,7 +87,7 @@ Returns a C object. =head1 FUNCTIONS -=head2 ($res, $c) = crequest( ... ); +=head2 ($res, $c) = ctx_request( ... ); Works exactly like C, except it also returns the catalyst context object, C<$c>. Note that this only works for local requests. @@ -119,12 +119,12 @@ sub import { no strict 'refs'; my $caller = caller(0); - *{"$caller\::request"} = $request; - *{"$caller\::get"} = $get; - *{"$caller\::crequest"} = sub { + *{"$caller\::request"} = $request; + *{"$caller\::get"} = $get; + *{"$caller\::ctx_request"} = sub { my $me = ref $self || $self; - ### throw an exception if crequest is being used against a remote + ### throw an exception if ctx_request is being used against a remote ### server Catalyst::Exception->throw("$me only works with local requests, not remote") if $ENV{CATALYST_SERVER}; diff --git a/t/unit_load_catalyst_test.t b/t/unit_load_catalyst_test.t index aadcbe2..7d4cf02 100644 --- a/t/unit_load_catalyst_test.t +++ b/t/unit_load_catalyst_test.t @@ -15,7 +15,7 @@ my $Url = 'http://localhost/'; my $Content = "root index"; my %Meth = ( - $Pkg => [qw|get request crequest|], # exported + $Pkg => [qw|get request ctx_request|], # exported $Class => [qw|local_request remote_request|], # not exported ); @@ -62,7 +62,7 @@ use_ok( $Class ); ### test exported methods again for my $meth ( @{ $Meth{$Pkg} } ) { SKIP: { - ### do a call, we should get a result and perhaps a $c if it's 'crequest'; + ### do a call, we should get a result and perhaps a $c if it's 'ctx_request'; my ($res, $c) = eval { $Pkg->can($meth)->( $Url ) }; ok( 1, " Called $Pkg->$meth( $Url )" ); @@ -74,8 +74,8 @@ use_ok( $Class ); is( $res_as_string, $Content, " Content as expected: $res_as_string" ); - ### some tests for 'crequest' - skip "Context tests skipped for '$meth'", 6 unless $meth eq 'crequest'; + ### some tests for 'ctx_request' + skip "Context tests skipped for '$meth'", 6 unless $meth eq 'ctx_request'; ok( $c, " Context object returned" ); isa_ok( $c, $App, " Object" );