X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FTest.pm;h=3de24ad53cb2d8b9449ba91adfab3552c029a1e1;hb=66d9e175a28989d4454714edf2cc2dab5ad64d96;hp=97de28fe76c2873e5fdf779df084397df9bdcc8b;hpb=b6898a9f489a6e5946a4640ec049ada70f47a48a;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm index 97de28f..3de24ad 100644 --- a/lib/Catalyst/Test.pm +++ b/lib/Catalyst/Test.pm @@ -3,9 +3,6 @@ package Catalyst::Test; use strict; use UNIVERSAL::require; -require Catalyst; - -my $class; $ENV{CATALYST_ENGINE} = 'Test'; =head1 NAME @@ -22,6 +19,9 @@ Catalyst::Test - Test Catalyst applications request('index.html'); get('index.html'); + # Run tests against a remote server + CATALYST_REMOTE='http://localhost:3000/' prove -l lib/ t/ + # Tests with inline apps need to use Catalyst::Engine::Test package TestApp; @@ -41,7 +41,6 @@ Catalyst::Test - Test Catalyst applications ok( get('/foo') =~ /bar/ ); - =head1 DESCRIPTION Test Catalyst applications. @@ -63,18 +62,60 @@ Returns a C object. =cut sub import { - my $self = shift; - if ( $class = shift ) { + my $self = shift; + my $class = shift; + + my ( $get, $request ); + + if ( $ENV{CATALYST_REMOTE} ) { + $request = sub { remote_request(@_) }; + $get = sub { remote_request(@_)->content }; + } + + else { $class->require; unless ( $INC{'Test/Builder.pm'} ) { die qq/Couldn't load "$class", "$@"/ if $@; } - no strict 'refs'; - my $caller = caller(0); - *{"$caller\::request"} = sub { $class->run(@_) }; - *{"$caller\::get"} = sub { $class->run(@_)->content }; + $request = sub { $class->run(@_) }; + $get = sub { $class->run(@_)->content }; } + + no strict 'refs'; + my $caller = caller(0); + *{"$caller\::request"} = $request; + *{"$caller\::get"} = $get; +} + +sub remote_request { + my $request = shift; + + require LWP::UserAgent; + + my $remote = URI->new( $ENV{CATALYST_REMOTE} ); + + unless ( ref $request ) { + + my $uri = + ( $request =~ m/http/i ) + ? URI->new($request) + : URI->new( 'http://localhost' . $request ); + + $request = $uri->canonical; + } + + $request->scheme( $remote->scheme ); + $request->host( $remote->host ); + $request->port( $remote->port ); + + unless ( ref $request eq 'HTTP::Request' ) { + $request = HTTP::Request->new( 'GET', $request ); + } + + my $agent = LWP::UserAgent->new; + + return $agent->request($request); } =head1 SEE ALSO