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

add 6 more tests for page and clean up the POD

Browse source
This commit is contained in:
Colin Kuskie 2006-09-29 22:51:18 +00:00
parent 066dbab461
commit b1a5c46fcb
2 changed files with 35 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/WebGUI/Session/Url.pm
View file

@ -316,8 +316,8 @@ Returns the URL of the current page.
=head3 pairs
Name value pairs to add to the URL in the form of:
gateway()
Name and value pairs as a string to add to the URL that will be returned.
name1=value1;name2=value2;name3=value3
=head3 useSiteUrl
@ -326,7 +326,9 @@ If set to "1" we'll use the full site URL rather than the script (gateway) URL.
=head3 skipPreventProxyCache
If set to "1" we'll skip adding the prevent proxy cache code to the url.
If preventing proxy caching is enabled in the settings, then if skipPreventProxyCache
is a 1 it will prevent the code that prevents proxy caching. If that doesn't make
your head hurt then you'll understand the rest of wG just fine.
=cut

35
t/Session/Url.t
View file

@ -14,6 +14,7 @@ use lib "$FindBin::Bin/../lib";
use WebGUI::Test;
use WebGUI::Session;
use WebGUI::Asset;
my @getRefererUrlTests = (
{
@ -51,7 +52,7 @@ my @getRefererUrlTests = (
use Test::More;
use Test::MockObject::Extends;
use Test::MockObject;
plan tests => 37 + scalar(@getRefererUrlTests);
plan tests => 43 + scalar(@getRefererUrlTests);
my $session = WebGUI::Test->session;
@ -211,14 +212,36 @@ is ($session->url->getRequestedUrl, 'path2/file2', 'getRequestedUrl, does not re
#
#######################################
my $sessionAsset = $session->asset;
$session->asset(undef);
$session->url->{_requestedUrl} = undef; ##Manually clear cached value
$requestedUrl = '/path1/file1';
is ($session->url->page, '/path1/file1', 'page with no args returns getRequestedUrl through gateway');
is($session->url->page, $requestedUrl, 'page with no args returns getRequestedUrl through gateway');
$url2 = 'http://'.$session->config->get('sitename')->[0].'/path1/file1';
is ($session->url->page('',1), $url2, 'page, withFullUrl includes method and sitename');
is($session->url->page('op=viewHelpTOC;topic=Article'), $requestedUrl.'?op=viewHelpTOC;topic=Article', 'page: pairs are appended');
$url2 = 'http://'.$session->config->get('sitename')->[0].$requestedUrl;
is($session->url->page('',1), $url2, 'page: withFullUrl includes method and sitename');
my $settingsPreventProxyCache = $session->setting->get('preventProxyCache');
$session->setting->set('preventProxyCache', 0);
is($session->url->page('','',1), $requestedUrl, 'page: skipPreventProxyCache is a no-op with preventProxyCache off in settings');
$session->setting->set('preventProxyCache', 1);
my $uncacheableUrl = $session->url->page('','',1);
diag($uncacheableUrl);
like($uncacheableUrl, qr{^$requestedUrl}, 'page: skipPreventProxyCache does not change url');
like($uncacheableUrl, qr/\?noCache=\d{0,4},\d+$/, 'page: skipPreventProxyCache adds noCache param to url');
is($session->url->page('','',0), $requestedUrl, 'page: skipPreventProxyCache does not change url');
$session->setting->set('preventProxyCache', $settingsPreventProxyCache);
my $defaultAsset = WebGUI::Asset->getDefault($session);
$session->asset($defaultAsset);
is($session->url->page, $session->url->gateway($defaultAsset->get('url')), 'page:session asset trumps requestedUrl');
$session->asset($sessionAsset);
#######################################
#
# getReferrerUrl
@ -273,9 +296,11 @@ my $unEscapedString = $session->url->unescape($escapeString);
is($escapedString, '10%25%20is%20enough!', 'escape method');
is($unEscapedString, '10% is enough!', 'unescape method');
END {
END { ##Always clean-up
$session->asset($sessionAsset);
$session->config->set('sitename', \@config_sitename);
$session->setting->set('hostToUse', $setting_hostToUse);
$session->setting->set('preventProxyCache', $settingsPreventProxyCache);
if ($config_port) {
$session->config->set($config_port);
}