tonyair
/
silverstripe-testsession
mirror of https://github.com/silverstripe/silverstripe-testsession
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed regression on file paths in manual test sessions

This commit is contained in:
Ingo Schommer 2014-03-04 17:49:41 +13:00
parent 2b5984a73c
commit 8aaaacc23c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/TestSessionEnvironment.php
View File

@ -166,6 +166,7 @@ class TestSessionEnvironment extends Object {
if(!isset($state->$k)) $state->$k = $v; // Don't overwrite stuff in $state, as that's the new state
}
}
if(isset($state->database) && $state->database) {
if(!DB::getConn()) {
// No connection, so try and connect to tmpdb if it exists
@ -377,7 +378,7 @@ class TestSessionEnvironment extends Object {
* @return stdClass Data as taken from the JSON object in {@link self::loadFromFile()}
*/
public function getState() {
$path = Director::getAbsFile($this->config()->test_state_file);
$path = Director::getAbsFile($this->getFilePath());
return (file_exists($path)) ? json_decode(file_get_contents($path)) : new stdClass;
}
}