oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some URL fixes and removing some uses of PseudoRequest

Browse source
This commit is contained in:
Graham Knop 2010-06-10 08:18:43 -05:00
parent 169218abf7
commit e063818e2d
5 changed files with 62 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

24
t/lib/WebGUI/Test.pm
View file

@ -128,7 +128,7 @@ END {
#----------------------------------------------------------------------------
=head2 newSession ( $noCleanup )
=head2 newSession ( $noCleanup, [ $request ] )
Builds a WebGUI session object for testing.
@ -136,14 +136,19 @@ Builds a WebGUI session object for testing.
If true, the session won't be registered for automatic deletion.
=head3 $request
Either a HTTP::Request object to use for this session, or a hash ref of form parameters.
=cut
sub newSession {
shift
if eval { $_[0]->isa($CLASS) };
my $noCleanup = shift;
my $request = shift;
require WebGUI::Session;
my $session = WebGUI::Session->open( $CLASS->config, newEnv() );
my $session = WebGUI::Session->open( $CLASS->config, newEnv( $request ) );
if ( ! $noCleanup ) {
$CLASS->addToCleanup($session);
}
@ -158,9 +163,18 @@ sub newEnv {
require HTTP::Message::PSGI;
require HTTP::Request::Common;
my $config = $CLASS->config;
my $url = 'http://' . $config->get('sitename')->[0];
my $env = HTTP::Request->new( $form ? ( POST => $url, [ %$form ] ) : ( GET => $url ) )->to_psgi;
return $env;
my $request;
if ( try { $form->isa('HTTP::Request') } ) {
$request = $form;
}
else {
my $url = 'http://' . $config->get('sitename')->[0];
$request = $form
? HTTP::Request::Common::POST( $url, [ %$form ] )
: HTTP::Request::Common::GET( $url )
;
}
return $request->to_psgi;
}
sub clientTest (&) {