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

Improved error checking in TestSession

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60425 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2008-08-11 23:02:22 +00:00
parent 655802177c
commit a94c7c8a2f
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
dev/TestSession.php
View File

@ -18,6 +18,7 @@ class TestSession {
*/
function get($url) {
$this->lastResponse = Director::test($url, null, $this->session);
if(!$this->lastResponse) user_error("Director::test($url) returned null", E_USER_WARNING);
return $this->lastResponse;
}
@ -26,6 +27,7 @@ class TestSession {
*/
function post($url, $data) {
$this->lastResponse = Director::test($url, $data, $this->session);
if(!$this->lastResponse) user_error("Director::test($url) returned null", E_USER_WARNING);
return $this->lastResponse;
}
@ -35,20 +37,25 @@ class TestSession {
*/
function submitForm($formID, $button = null, $data = array()) {
$page = $this->lastPage();
$form = $page->getFormById($formID);
if($page) {
$form = $page->getFormById($formID);
foreach($data as $k => $v) {
$form->setField(new SimpleByName($k), $v);
foreach($data as $k => $v) {
$form->setField(new SimpleByName($k), $v);
}
if($button) $submission = $form->submitButton(new SimpleByName($button));
else $submission = $form->submit();
$url = Director::makeRelative($form->getAction()->asString());
$postVars = array();
parse_str($submission->_encode(), $postVars);
return $this->post($url, $postVars);
} else {
user_error("TestSession::submitForm called when there is no form loaded. Visit the page with the form first", E_USER_WARNING);
}
if($button) $submission = $form->submitButton(new SimpleByName($button));
else $submission = $form->submit();
$url = Director::makeRelative($form->getAction()->asString());
$postVars = array();
parse_str($submission->_encode(), $postVars);
return $this->post($url, $postVars);
}
/**
@ -99,11 +106,13 @@ class TestSession {
require_once("thirdparty/simpletest/form.php");
$builder = &new SimplePageBuilder();
$page = &$builder->parse(new TestSession_STResponseWrapper($this->lastResponse));
$builder->free();
unset($builder);
if($this->lastResponse) {
$page = &$builder->parse(new TestSession_STResponseWrapper($this->lastResponse));
$builder->free();
unset($builder);
return $page;
return $page;
}
}
/**