X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FTest.pm;h=9791b24a70189b9df2dcbe37af883d560f4b8e1b;hb=d11e0c1d9eccf6f0fe7f1c2bd0313d5cf742b772;hp=7c3022a9c441a080cb9abc6e7455f8c4e3f57bdd;hpb=6cf9bf47126ced88c8b6955b7fbca88be0df0acf;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm index 7c3022a..9791b24 100644 --- a/lib/Catalyst/Test.pm +++ b/lib/Catalyst/Test.pm @@ -1,17 +1,79 @@ package Catalyst::Test; -use Test::More; - use strict; use warnings; +use Test::More; use Catalyst::Exception; use Catalyst::Utils; -use Class::Inspector; +use Class::MOP; +use Sub::Exporter; + +sub build_exports { + my ($self, $meth, $args, $defaults) = @_; + + my $request; + my $class = $args->{class}; + + if ( $ENV{CATALYST_SERVER} ) { + $request = sub { remote_request(@_) }; + } elsif (! $class) { + $request = sub { Catalyst::Exception->throw("Must specify a test app: use Catalyst::Test 'TestApp'") }; + } else { + unless (Class::MOP::is_class_loaded($class)) { + Class::MOP::load_class($class); + } + $class->import; -use parent qw/Exporter/; -our @EXPORT=qw/&content_like &action_ok &action_redirect &action_notfound &contenttype_is/; + $request = sub { local_request( $class, @_ ) }; + } + my $get = sub { $request->(@_)->content }; + + return { + request => $request, + get => $get, + content_like => sub { + my $action = shift; + return Test::More->builder->like($get->($action),@_); + }, + action_ok => sub { + my $action = shift; + return Test::More->builder->ok($request->($action)->is_success, @_); + }, + action_redirect => sub { + my $action = shift; + return Test::More->builder->ok($request->($action)->is_redirect,@_); + }, + action_notfound => sub { + my $action = shift; + return Test::More->builder->is_eq($request->($action)->code,404,@_); + }, + contenttype_is => sub { + my $action = shift; + my $res = $request->($action); + return Test::More->builder->is_eq(scalar($res->content_type),@_); + }, + }; +} + +use namespace::clean; +our $default_host; + +{ + my $import = Sub::Exporter::build_exporter({ + groups => [ all => \&build_exports ], + into_level => 1, + }); + + + sub import { + my ($self, $class, $opts) = @_; + $import->($self, '-all' => { class => $class }); + $opts ||= {}; + $default_host = $opts->{default_host} if exists $opts->{default_host}; + } +} =head1 NAME @@ -55,6 +117,15 @@ Catalyst::Test - Test Catalyst Applications ok( get('/foo') =~ /bar/ ); + # mock virtual hosts + use Catalyst::Test 'MyApp', { default_host => 'myapp.com' }; + like( get('/whichhost'), qr/served by myapp.com/ ); + like( get( '/whichhost', { host => 'yourapp.com' } ), qr/served by yourapp.com/ ); + { + local $Catalyst::Test::default_host = 'otherapp.com'; + like( get('/whichhost'), qr/served by otherapp.com/ ); + } + =head1 DESCRIPTION This module allows you to make requests to a Catalyst application either without @@ -87,40 +158,11 @@ method and the L method below: =head2 request -Returns a C object. +Returns a C object. Accepts an optional hashref for request +header configuration; currently only supports setting 'host' value. my $res = request('foo/bar?test=1'); - -=cut - -sub import { - my $self = shift; - my $class = shift; - - my ( $get, $request ); - - if ( $ENV{CATALYST_SERVER} ) { - $request = sub { remote_request(@_) }; - $get = sub { remote_request(@_)->content }; - } elsif (! $class) { - $request = sub { Catalyst::Exception->throw("Must specify a test app: use Catalyst::Test 'TestApp'") }; - $get = $request; - } else { - unless( Class::Inspector->loaded( $class ) ) { - require Class::Inspector->filename( $class ); - } - $class->import; - - $request = sub { local_request( $class, @_ ) }; - $get = sub { local_request( $class, @_ )->content }; - } - - no strict 'refs'; - my $caller = caller(0); - *{"$caller\::request"} = $request; - *{"$caller\::get"} = $get; - __PACKAGE__->export_to_level(1); -} + my $virtual_res = request('foo/bar?test=1', {host => 'virtualhost.com'}); =head2 local_request @@ -134,6 +176,7 @@ sub local_request { require HTTP::Request::AsCGI; my $request = Catalyst::Utils::request( shift(@_) ); + _customize_request($request, @_); my $cgi = HTTP::Request::AsCGI->new( $request, %ENV )->setup; $class->handle_request; @@ -156,6 +199,8 @@ sub remote_request { my $request = Catalyst::Utils::request( shift(@_) ); my $server = URI->new( $ENV{CATALYST_SERVER} ); + _customize_request($request, @_); + if ( $server->path =~ m|^(.+)?/$| ) { my $path = $1; $server->path("$path") if $path; # need to be quoted @@ -195,6 +240,10 @@ sub remote_request { keep_alive => 1, max_redirect => 0, timeout => 60, + + # work around newer LWP max_redirect 0 bug + # http://rt.cpan.org/Ticket/Display.html?id=40260 + requests_redirectable => [], ); $agent->env_proxy; @@ -203,6 +252,14 @@ sub remote_request { return $agent->request($request); } +sub _customize_request { + my $request = shift; + my $opts = pop(@_) || {}; + if ( my $host = exists $opts->{host} ? $opts->{host} : $default_host ) { + $request->header( 'Host' => $host ); + } +} + =head2 action_ok Fetches the given url and check that the request was successful @@ -223,52 +280,6 @@ Fetches the given url and matches the content against it. Check for given mime type -=cut - -sub content_like { - my $caller=caller(0); - no strict 'refs'; - my $get=*{"$caller\::get"}; - my $action=shift; - return Test::More->builder->like(&$get($action),@_); -} - -sub action_ok { - my $caller=caller(0); - no strict 'refs'; - my $request=*{"$caller\::request"}; - my $action=shift; - return Test::More->builder->ok(&$request($action)->is_success, @_); -} - -sub action_redirect { - my $caller=caller(0); - no strict 'refs'; - my $request=*{"$caller\::request"}; - my $action=shift; - return Test::More->builder->ok(&$request($action)->is_redirect,@_); - -} - -sub action_notfound { - my $caller=caller(0); - no strict 'refs'; - my $request=*{"$caller\::request"}; - my $action=shift; - return Test::More->builder->is_eq(&$request($action)->code,404,@_); - -} - - -sub contenttype_is { - my $caller=caller(0); - no strict 'refs'; - my $request=*{"$caller\::request"}; - my $action=shift; - my $res=&$request($action); - return Test::More->builder->is_eq(scalar($res->content_type),@_); -} - =head1 SEE ALSO L, L,