X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FTest.pm;h=023b8e51c1f7ec58b0f97131ead9c5687e68862a;hp=a9f74e5512112b4f78a1d6d2bde805a6f20c1f93;hb=74dafab798a163c251e09de7fcc21a267d1678a6;hpb=d837e1a7eadff19ff04373ad19d22fa293e19db5 diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm index a9f74e5..023b8e5 100644 --- a/lib/Catalyst/Test.pm +++ b/lib/Catalyst/Test.pm @@ -2,6 +2,7 @@ package Catalyst::Test; use strict; +use Catalyst::Exception; use Catalyst::Utils; use UNIVERSAL::require; @@ -22,7 +23,7 @@ Catalyst::Test - Test Catalyst applications get('index.html'); # Run tests against a remote server - CATALYST_SERVER='http://localhost:3000/' prove -l lib/ t/ + CATALYST_SERVER='http://localhost:3000/' prove -r -l lib/ t/ # Tests with inline apps need to use Catalyst::Engine::Test package TestApp; @@ -78,9 +79,6 @@ sub import { else { $class->require; - my $error = $UNIVERSAL::require::ERROR; - die qq/Couldn't load "$class", "$error"/ if $@; - $class->import; $request = sub { $class->run(@_) }; @@ -97,17 +95,17 @@ my $agent; =item remote_request -Do an actual remote rquest using LWP. +Do an actual remote request using LWP. =cut sub remote_request { - require LWP::UserAgent; - + require LWP::UserAgent; + my $request = Catalyst::Utils::request( shift(@_) ); - my $server = URI->new( $ENV{CATALYST_SERVER} ); + my $server = URI->new( $ENV{CATALYST_SERVER} ); if ( $server->path =~ m|^(.+)?/$| ) { $server->path("$1"); # need to be quoted @@ -118,7 +116,7 @@ sub remote_request { $request->uri->port( $server->port ); $request->uri->path( $server->path . $request->uri->path ); - unless ( $agent ) { + unless ($agent) { $agent = LWP::UserAgent->new( keep_alive => 1,