Merge r9534 renaming kanes crequest to ctx_request up from 5.70 trunk. 5.80 is now...

diff --git a/Changes b/Changes
index 263623b..7b9b431 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,7 +1,7 @@
 # This file documents the revision history for Perl extension Catalyst.
 
-        - Add Catalyst::Test::crequest to return both HTTP::Response object
-          & $c for local requests (kane)
+        - Added Catalyst::Test::ctx_request to be able to inspect
+          the context object after a request is made (Jos Boumans)
         - debug() POD rewrite (jhannah)
         - Change the warning when you have conflicting components to
           present a list (t0m)

diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm
index 5e0ee16..815166a 100644 (file)
--- a/lib/Catalyst/Test.pm
+++ b/lib/Catalyst/Test.pm
@@ -30,10 +30,10 @@ my $build_exports = sub {
 
     my $get = sub { $request->(@_)->content };
 
-    my $crequest = sub {
+    my $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};
@@ -60,9 +60,9 @@ my $build_exports = sub {
     };
 
     return {
-        request  => $request,
-        get      => $get,
-        crequest => $crequest,
+        request      => $request,
+        get          => $get,
+        ctx_request  => $ctx_request,
         content_like => sub {
             my $action = shift;
             return Test::More->builder->like($get->($action),@_);
@@ -118,7 +118,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', [
@@ -197,7 +197,7 @@ header configuration; currently only supports setting 'host' value.
 
 =head1 FUNCTIONS
 
-=head2 ($res, $c) = crequest( ... );
+=head2 ($res, $c) = ctx_request( ... );
 
 Works exactly like C<Catalyst::Test::request>, except it also returns the
 catalyst context object, C<$c>. Note that this only works for local requests.

diff --git a/t/unit_load_catalyst_test.t b/t/unit_load_catalyst_test.t
index b8ec679..a3a3b37 100644 (file)
--- a/t/unit_load_catalyst_test.t
+++ b/t/unit_load_catalyst_test.t
@@ -19,7 +19,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
 );
 
@@ -66,7 +66,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 )" );
@@ -78,8 +78,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" );