tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Don't' set 'Referer' header in FunctionalTest->get()/post() if its explicitly passed to the method

Browse Source
This commit is contained in:
Ingo Schommer 2012-05-04 11:30:45 +02:00
parent 20a837947f
commit 1f7f8b8aee
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/TestSession.php
View File

@ -43,7 +43,7 @@ class TestSession {
*/ */
function get($url, $session = null, $headers = null, $cookies = null) { function get($url, $session = null, $headers = null, $cookies = null) {
$headers = (array) $headers; $headers = (array) $headers;
if($this->lastUrl) $headers['Referer'] = $this->lastUrl; if($this->lastUrl && !isset($headers['Referer'])) $headers['Referer'] = $this->lastUrl;
$this->lastResponse = Director::test($url, null, $session ? $session : $this->session, null, null, $headers, $cookies); $this->lastResponse = Director::test($url, null, $session ? $session : $this->session, null, null, $headers, $cookies);
$this->lastUrl = $url; $this->lastUrl = $url;
if(!$this->lastResponse) user_error("Director::test($url) returned null", E_USER_WARNING); if(!$this->lastResponse) user_error("Director::test($url) returned null", E_USER_WARNING);
@ -56,7 +56,7 @@ class TestSession {
*/ */
function post($url, $data, $headers = null, $session = null, $body = null, $cookies = null) { function post($url, $data, $headers = null, $session = null, $body = null, $cookies = null) {
$headers = (array) $headers; $headers = (array) $headers;
if($this->lastUrl) $headers['Referer'] = $this->lastUrl; if($this->lastUrl && !isset($headers['Referer'])) $headers['Referer'] = $this->lastUrl;
$this->lastResponse = Director::test($url, $data, $session ? $session : $this->session, null, $body, $headers, $cookies); $this->lastResponse = Director::test($url, $data, $session ? $session : $this->session, null, $body, $headers, $cookies);
$this->lastUrl = $url; $this->lastUrl = $url;
if(!$this->lastResponse) user_error("Director::test($url) returned null", E_USER_WARNING); if(!$this->lastResponse) user_error("Director::test($url) returned null", E_USER_WARNING);