Remove getRedirectLocation and setRedirectLocation from Session::Http

This commit is contained in:
Colin Kuskie 2010-11-22 09:28:14 -08:00
parent 8b6bbdb9f7
commit 995b04e7de
8 changed files with 33 additions and 51 deletions

View file

@ -20,8 +20,6 @@ use Data::Dumper;
use Test::More; # increment this value for each test you create
use Test::Deep;
plan tests => 40;
my $session = WebGUI::Test->session;
my $http = $session->http;
@ -100,7 +98,7 @@ $http->setCacheControl(undef);
####################################################
#
# setRedirect, getRedirectLocation
# setRedirect
#
####################################################
@ -108,7 +106,7 @@ $session->request->uri('/here/later');
$http->setRedirect('/here/now');
is($response->status, 302, 'setRedirect: sets HTTP status');
is($http->getRedirectLocation, '/here/now', 'setRedirect: redirect location');
is($response->location, '/here/now', 'setRedirect: redirect location');
$session->style->useEmptyStyle(1);
my $styled = $session->style->generateAdditionalHeadTags();
@ -414,6 +412,8 @@ is($http->sendHeader, undef, 'sendHeader returns undef when no request object is
ok $session->http->ifModifiedSince(WebGUI::Test->webguiBirthday - 5, 3600), '... epoch check, made true by maxCacheTimeout';
}
done_testing;
####################################################
#
# Utility functions

View file

@ -447,7 +447,7 @@ ok( ! $session->url->forceSecureConnection('/test/url'), 'all conditions must be
##Validate the HTTP object state before we start
$session->response->status('200');
is($session->response->status, 200, 'http status is okay, 200');
is($session->http->getRedirectLocation, undef, 'redirect location is empty');
is($session->response->location, undef, 'redirect location is empty');
$env->{'psgi.url_scheme'} = "http";
@ -456,14 +456,14 @@ $secureUrl =~ s/http:/https:/;
ok($session->url->forceSecureConnection('/foo/bar/baz/buz'), 'forced secure connection');
is($session->response->status, 302, 'http status set to redirect, 302');
is($session->http->getRedirectLocation, $secureUrl, 'redirect location set to proper passed in URL with SSL and sitename added');
is($session->response->location, $secureUrl, 'redirect location set to proper passed in URL with SSL and sitename added');
$session->response->status('200', 'OK');
$session->http->setRedirectLocation(undef);
$session->response->location(undef);
$secureUrl = $session->url->getSiteURL . $session->url->page();
$secureUrl =~ s/http:/https:/;
ok($session->url->forceSecureConnection(), 'forced secure connection with no url param');
ok($session->http->isRedirect, '... and redirect status code was set');
is($session->http->getRedirectLocation, $secureUrl, '... and redirect status code was set');
is($session->response->location, $secureUrl, '... and redirect status code was set');