X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FTest.pm;h=d565abf7b57b4b639ce7a73765899b00e954ed13;hb=bcd1002b0ed8c8fe6dbfdc94417be0fe8cd52832;hp=8157bf32f6ba307120fab1140552f0be29d052ab;hpb=21465c884872c1ec8c30acd72796445f9eaacb31;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm index 8157bf3..d565abf 100644 --- a/lib/Catalyst/Test.pm +++ b/lib/Catalyst/Test.pm @@ -62,7 +62,7 @@ Returns the content. Returns a C object. - my $res =request('foo/bar?test=1'); + my $res = request('foo/bar?test=1'); =cut @@ -79,16 +79,7 @@ sub import { else { $class->require; - - if ( $@ ) { - - my $error = $UNIVERSAL::require::ERROR; - - Catalyst::Exception->throw( - message => qq/Couldn't load "$class", "$error"/ - ); - } - + die if $@ && $@ !~ /^Can't locate /; $class->import; $request = sub { $class->run(@_) }; @@ -111,11 +102,11 @@ Do an actual remote request using LWP. 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 @@ -126,7 +117,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,