X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FTest.pm;h=385d25b888ce792e614d2d1d8f54602ed6a8115c;hb=e519ff34e2a938383954a3f66db2e08475cbc0e8;hp=fd53e180b2883d69b6a2273dd0d1354a80636ad0;hpb=bc024080353d9982272a134e49e8601ed20c1a50;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm
index fd53e18..385d25b 100644
--- a/lib/Catalyst/Test.pm
+++ b/lib/Catalyst/Test.pm
@@ -2,15 +2,8 @@ package Catalyst::Test;
 
 use strict;
 use UNIVERSAL::require;
-use HTTP::Response;
-use Socket;
-use URI;
 
-require Catalyst;
-
-my $class;
-$ENV{CATALYST_ENGINE} = 'CGI';
-$ENV{CATALYST_TEST}   = 1;
+$ENV{CATALYST_ENGINE} = 'Test';
 
 =head1 NAME
 
@@ -18,16 +11,33 @@ Catalyst::Test - Test Catalyst applications
 
 =head1 SYNOPSIS
 
+    # Helper
+    script/test.pl
+
     # Tests
     use Catalyst::Test 'TestApp';
     request('index.html');
     get('index.html');
 
-    # Request
-    perl -MCatalyst::Test=MyApp -e1 index.html
+    # Tests with inline apps need to use Catalyst::Engine::Test
+    package TestApp;
+
+    use Catalyst qw[-Engine=Test];
+
+    __PACKAGE__->action(
+        foo => sub {
+            my ( $self, $c ) = @_;
+            $c->res->output('bar');
+        }
+    );
+
+    package main;
+
+    use Test::More tests => 1;
+    use Catalyst::Test 'TestApp';
+
+    ok( get('/foo') =~ /bar/ );
 
-    # Server
-    perl -MCatalyst::Test=MyApp -e1 3000
 
 =head1 DESCRIPTION
 
@@ -49,125 +59,19 @@ Returns a C<HTTP::Response> object.
 
 =cut
 
-{
-    no warnings;
-    CHECK {
-        if ( ( caller(0) )[1] eq '-e' ) {
-            if ( $ARGV[0] =~ /^\d+$/ ) { server( $ARGV[0] ) }
-            else { print request( $ARGV[0] || 'http://localhost' )->content }
-        }
-    }
-}
-
 sub import {
     my $self = shift;
-    if ( $class = shift ) {
+    if ( my $class = shift ) {
         $class->require;
         unless ( $INC{'Test/Builder.pm'} ) {
             die qq/Couldn't load "$class", "$@"/ if $@;
         }
-        my $caller = caller(0);
-        no strict 'refs';
-        *{"$caller\::request"} = \&request;
-        *{"$caller\::get"} = sub { request(@_)->content };
-    }
-}
-
-sub request {
-    my $uri = shift;
-    local *STDOUT;
-    my $output = '';
-    open STDOUT, '>', \$output;
-    $uri = URI->new($uri);
-    my %clean = %ENV;
-    $ENV{REQUEST_METHOD} ||= 'GET';
-    $ENV{HTTP_HOST}      ||= $uri->authority || 'localhost';
-    $ENV{SCRIPT_NAME}    ||= $uri->path || '/';
-    $ENV{QUERY_STRING}   ||= $uri->query || '';
-    $ENV{CONTENT_TYPE}   ||= 'text/plain';
-    $class->handler;
-    %ENV = %clean;
-    return HTTP::Response->parse($output);
-}
-
-=head3 server
-
-Starts a testserver.
+        $class->import;
 
-    Catalyst::Test::server(3000);
-
-=cut
-
-sub server {
-    my ( $port, $script ) = @_;
-
-    # Listen
-    my $tcp = getprotobyname('tcp');
-    socket( HTTPDaemon, PF_INET, SOCK_STREAM, $tcp ) or die $!;
-    setsockopt( HTTPDaemon, SOL_SOCKET, SO_REUSEADDR, pack( "l", 1 ) )
-      or warn $!;
-    bind( HTTPDaemon, sockaddr_in( $port, INADDR_ANY ) ) or die $!;
-    listen( HTTPDaemon, SOMAXCONN ) or die $!;
-
-    print "You can connect to your server at http://localhost:$port\n";
-
-    # Process
-    my %clean = %ENV;
-    for ( ; accept( Remote, HTTPDaemon ) ; close Remote ) {
-        *STDIN  = *Remote;
-        *STDOUT = *Remote;
-        my $remote_sockaddr = getpeername(STDIN);
-        my ( undef, $iaddr ) = sockaddr_in($remote_sockaddr);
-        my $peername = gethostbyaddr( $iaddr, AF_INET ) || "localhost";
-        my $peeraddr = inet_ntoa($iaddr) || "127.0.0.1";
-        my $local_sockaddr = getsockname(STDIN);
-        my ( undef, $localiaddr ) = sockaddr_in($local_sockaddr);
-        my $localname = gethostbyaddr( $localiaddr, AF_INET ) || 'localhost';
-        my $localaddr = inet_ntoa($localiaddr) || '127.0.0.1';
-        my $chunk;
-
-        while ( sysread( STDIN, my $buff, 1 ) ) {
-            last if $buff eq "\n";
-            $chunk .= $buff;
-        }
-        my ( $method, $request_uri, $proto, undef ) = split /\s+/, $chunk;
-        my ( $file, undef, $query_string ) =
-          ( $request_uri =~ /([^?]*)(\?(.*))?/ );
-        last if ( $method !~ /^(GET|POST|HEAD)$/ );
-        %ENV = %clean;
-
-        $chunk = '';
-        while ( sysread( STDIN, my $buff, 1 ) ) {
-            if ( $buff eq "\n" ) {
-                $chunk =~ s/[\r\l\n\s]+$//;
-                if ( $chunk =~ /^([\w\-]+): (.+)/i ) {
-                    my $tag = uc($1);
-                    $tag =~ s/^COOKIES$/COOKIE/;
-                    my $val = $2;
-                    $tag =~ s/-/_/g;
-                    $tag = "HTTP_" . $tag
-                      unless ( grep /^$tag$/, qw(CONTENT_LENGTH CONTENT_TYPE) );
-                    if ( $ENV{$tag} ) { $ENV{$tag} .= "; $val" }
-                    else { $ENV{$tag} = $val }
-                }
-                last if $chunk =~ /^$/;
-                $chunk = '';
-            }
-            else { $chunk .= $buff }
-        }
-        $ENV{SERVER_PROTOCOL} = $proto;
-        $ENV{SERVER_PORT}     = $port;
-        $ENV{SERVER_NAME}     = $localname;
-        $ENV{SERVER_URL}      = "http://$localname:$port/";
-        $ENV{PATH_INFO}       = $file;
-        $ENV{REQUEST_URI}     = $request_uri;
-        $ENV{REQUEST_METHOD}  = $method;
-        $ENV{REMOTE_ADDR}     = $peeraddr;
-        $ENV{REMOTE_HOST}     = $peername;
-        $ENV{QUERY_STRING}    = $query_string || '';
-        $ENV{CONTENT_TYPE}    ||= 'multipart/form-data';
-        $ENV{SERVER_SOFTWARE} ||= "Catalyst/$Catalyst::VERSION";
-        $script ? print STDOUT `$script` : $class->run;
+        no strict 'refs';
+        my $caller = caller(0);
+        *{"$caller\::request"} = sub { $class->run(@_) };
+        *{"$caller\::get"}     = sub { $class->run(@_)->content };
     }
 }