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

Remove Session::Env, migrate code to Plack::Request object in Session, and WebGUI::Session::Request

Browse source
This commit is contained in:
Colin Kuskie 2010-07-01 17:40:12 -07:00
parent 005b9da1ac
commit e0177dc666
27 changed files with 131 additions and 285 deletions
Download patch file Download diff file Expand all files Collapse all files

9
t/Asset/Post/Thread.t
View file

@ -57,15 +57,6 @@ my $uncommittedThread = $collab->addChild($props, @addArgs);
# Test for a sane object type
isa_ok($thread, 'WebGUI::Asset::Post::Thread');
my $env = $session->env;
$env = Test::MockObject::Extends->new($env);
my %mockEnv = (
REMOTE_ADDR => '192.168.0.2',
);
$env->mock('get', sub { return $mockEnv{$_[1]}});
$session->user({userId => 3});
$thread->rate(1);
$thread->trash;

1
t/Asset/Wobject/InOutBoard.t
View file

@ -144,6 +144,7 @@ cmp_bag(
dateStamp => ignore(),
message => 'work time',
username => 'red',
department => 'No Department',
},
ignore(), ignore(), ignore(), ignore(),
],

6
t/Macro/L_loginBox.t
View file

@ -30,7 +30,7 @@ $session->user({userId=>1});
##known user agent. Since it usually contains a reference to %ENV,
##you can't just modify that hash since it's protected
my $env = $session->request->env;
$env->{'HTTP_USER_AGENT'} = 'mozilla';
$session->request->headers->user_agent('mozilla');
$env->{'QUERY_STRING'} = 'func=search';
my $i18n = WebGUI::International->new($session,'Macro_L_loginBox');
@ -102,7 +102,7 @@ is($vars{'form.footer'}, WebGUI::Form::formFooter($session), 'form.footer');
is( $vars{'form.returnUrl'},
WebGUI::Form::hidden( $session, {
name => 'returnUrl',
value => $session->url->page($session->env->get("QUERY_STRING")),
value => $session->url->page($session->request->env->{"QUERY_STRING"}),
}),
'form.returnUrl'
);
@ -119,7 +119,7 @@ like($vars{'username.form'}, qr/size="16"/, 'boxSize set in username.form');
like($vars{'password.form'}, qr/size="16"/, 'boxSize set in password.form');
##Change browser to be MSIE like and watch boxSize change
$env->{'HTTP_USER_AGENT'} = 'msie';
$session->request->headers->user_agent('msie');
$output = WebGUI::Macro::L_loginBox::process($session,24,'Log In',$template->getId);
%vars = simpleTextParser($output);

4
t/Session/CheckClient.t
View file

@ -185,9 +185,9 @@ sub testCount {
plan tests => testCount() ;
foreach my $testSet (@testArray) {
$session->request->env->{HTTP_USER_AGENT} = $testSet->{agent};
$session->request->headers->user_agent($testSet->{agent});
$session->request->env->{REMOTE_ADDR} = $testSet->{address} || '69.42.78.32';
my $output = $session->env->requestNotViewed;
my $output = $session->request->requestNotViewed;
is($output, $testSet->{output}, $testSet->{comment});
}

28
t/Session/Env.t
View file

@ -1,28 +0,0 @@
#-------------------------------------------------------------------
# WebGUI is Copyright 2001-2009 Plain Black Corporation.
#-------------------------------------------------------------------
# Please read the legal notices (docs/legal.txt) and the license
# (docs/license.txt) that came with this distribution before using
# this software.
#-------------------------------------------------------------------
# http://www.plainblack.com info@plainblack.com
#-------------------------------------------------------------------
use FindBin;
use strict;
use lib "$FindBin::Bin/../lib";
use WebGUI::Test;
use WebGUI::Session;
use Test::More tests => 2; # increment this value for each test you create
my $session = WebGUI::Test->session;
cmp_ok($session->env->get("REMOTE_ADDR"), 'ne', "", "get() one valid entry");
my $env = $session->env;
$session->request->env->{REMOTE_ADDR} = '192.168.0.2';
#is ($env->getIp, '192.168.0.2', 'getIp');

8
t/Session/Url.t
View file

@ -50,7 +50,7 @@ my @getRefererUrlTests = (
);
use Test::More;
plan tests => 83 + scalar(@getRefererUrlTests);
plan tests => 82 + scalar(@getRefererUrlTests);
my $session = WebGUI::Test->session;
my $request = $session->request;
@ -242,12 +242,8 @@ $session->asset($sessionAsset);
#
#######################################
$env->{'HTTP_REFERER'} = 'test';
is($session->env->get('HTTP_REFERER'), 'test', 'testing overridden ENV');
foreach my $test (@getRefererUrlTests) {
$env->{HTTP_REFERER} = $test->{input};
$session->request->referer($test->{input});
is($session->url->getRefererUrl, $test->{output}, $test->{comment});
}

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

@ -216,6 +216,7 @@ sub newEnv {
? HTTP::Request::Common::POST( $url, [ %$form ] )
: HTTP::Request::Common::GET( $url )
;
$request->headers->user_agent('WebGUI');
}
return $request->to_psgi;
}