Fixed Catalyst::Test to not throw a exception when the appclass can't be required

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Test.pm

diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm
index ff4437c..023b8e5 100644 (file)
--- a/lib/Catalyst/Test.pm
+++ b/lib/Catalyst/Test.pm
@@ -1,11 +1,11 @@
 package Catalyst::Test;
 
 use strict;
-use UNIVERSAL::require;
 
-require Catalyst;
+use Catalyst::Exception;
+use Catalyst::Utils;
+use UNIVERSAL::require;
 
-my $class;
 $ENV{CATALYST_ENGINE} = 'Test';
 
 =head1 NAME
@@ -22,8 +22,27 @@ Catalyst::Test - Test Catalyst applications
     request('index.html');
     get('index.html');
 
-    # Request
-    perl -MCatalyst::Test=MyApp -e1 index.html
+    # Run tests against a remote server
+    CATALYST_SERVER='http://localhost:3000/' prove -r -l lib/ t/
+
+    # Tests with inline apps need to use Catalyst::Engine::Test
+    package TestApp;
+
+    use Catalyst qw[-Engine=Test];
+
+    sub foo : Global {
+            my ( $self, $c ) = @_;
+            $c->res->output('bar');
+    }
+
+    __PACKAGE__->setup();
+
+    package main;
+
+    use Test::More tests => 1;
+    use Catalyst::Test 'TestApp';
+
+    ok( get('/foo') =~ /bar/ );
 
 =head1 DESCRIPTION
 
@@ -31,13 +50,15 @@ Test Catalyst applications.
 
 =head2 METHODS
 
-=head3 get
+=over 4
+
+=item get
 
 Returns the content.
 
     my $content = get('foo/bar?test=1');
 
-=head3 request
+=item request
 
 Returns a C<HTTP::Response> object.
 
@@ -45,37 +66,72 @@ Returns a C<HTTP::Response> object.
 
 =cut
 
-{
-    no warnings;
-    CHECK {
-        if ( ( caller(0) )[1] eq '-e' ) {
-            print request( $ARGV[0] || 'http://localhost' )->content;
-        }
+sub import {
+    my $self  = shift;
+    my $class = shift;
+
+    my ( $get, $request );
+
+    if ( $ENV{CATALYST_SERVER} ) {
+        $request = sub { remote_request(@_) };
+        $get     = sub { remote_request(@_)->content };
     }
-}
 
-sub import {
-    my $self = shift;
-    if ( $class = shift ) {
+    else {
         $class->require;
-        unless ( $INC{'Test/Builder.pm'} ) {
-            die qq/Couldn't load "$class", "$@"/ if $@;
-        }
+        $class->import;
 
-        no strict 'refs';
+        $request = sub { $class->run(@_) };
+        $get     = sub { $class->run(@_)->content };
+    }
 
-        unless ( $class->engine->isa('Catalyst::Engine::Test') ) {
-            require Catalyst::Engine::Test;
-            splice( @{"$class\::ISA"}, @{"$class\::ISA"} - 1,
-                0, 'Catalyst::Engine::Test' );
-        }
+    no strict 'refs';
+    my $caller = caller(0);
+    *{"$caller\::request"} = $request;
+    *{"$caller\::get"}     = $get;
+}
+
+my $agent;
+
+=item remote_request
+
+Do an actual remote request using LWP.
+
+=cut
+
+sub remote_request {
+
+    require LWP::UserAgent;
+
+    my $request = Catalyst::Utils::request( shift(@_) );
 
-        my $caller = caller(0);
-        *{"$caller\::request"} = sub { $class->run(@_) };
-        *{"$caller\::get"}     = sub { $class->run(@_)->content };
+    my $server = URI->new( $ENV{CATALYST_SERVER} );
+
+    if ( $server->path =~ m|^(.+)?/$| ) {
+        $server->path("$1");    # need to be quoted
+    }
+
+    $request->uri->scheme( $server->scheme );
+    $request->uri->host( $server->host );
+    $request->uri->port( $server->port );
+    $request->uri->path( $server->path . $request->uri->path );
+
+    unless ($agent) {
+
+        $agent = LWP::UserAgent->new(
+            keep_alive   => 1,
+            max_redirect => 0,
+            timeout      => 60,
+        );
+
+        $agent->env_proxy;
     }
+
+    return $agent->request($request);
 }
 
+=back 
+
 =head1 SEE ALSO
 
 L<Catalyst>.