More tests for WebGUI::Session::Url::getSiteUrl, which now has 100% test coverage.

Refactored getSiteUrl so it is very obvious as to how it works, replacing
code that was hard to cover.
This commit is contained in:
Colin Kuskie 2006-09-29 02:30:54 +00:00
parent c71a1ac5ee
commit 8174f9d2b4
2 changed files with 33 additions and 6 deletions

View file

@ -231,10 +231,10 @@ sub getSiteURL {
unless ($self->{_siteUrl}) {
my $site = "";
my $sitenames = $self->session->config->get("sitename");
if ($self->session->setting->get("hostToUse") eq "sitename" || !isIn($self->session->env->get("HTTP_HOST"),@{$sitenames})) {
$site = $sitenames->[0];
if ($self->session->setting->get("hostToUse") eq "HTTP_HOST" and isIn($self->session->env->get("HTTP_HOST"),@{$sitenames})) {
$site = $self->session->env->get("HTTP_HOST");
} else {
$site = $self->session->env->get("HTTP_HOST") || $sitenames->[0];
$site = $sitenames->[0];
}
my $proto = "http://";
if ($self->session->env->get("HTTPS") eq "on") {