Update testsession for SapphireTest changes

This commit is contained in:
Damian Mooyman 2017-06-13 15:00:32 +12:00
parent 9ec863f917
commit 1651d5695a
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A

View File

@ -2,22 +2,21 @@
namespace SilverStripe\TestSession; namespace SilverStripe\TestSession;
use Exception;
use InvalidArgumentException;
use LogicException;
use SilverStripe\Control\Director; use SilverStripe\Control\Director;
use SilverStripe\Control\HTTPRequest; use SilverStripe\Control\HTTPRequest;
use SilverStripe\Control\Session;
use SilverStripe\Core\Config\Configurable; use SilverStripe\Core\Config\Configurable;
use SilverStripe\Core\Extensible; use SilverStripe\Core\Extensible;
use SilverStripe\Core\Injector\Injectable; use SilverStripe\Core\Injector\Injectable;
use SilverStripe\Core\Injector\Injector; use SilverStripe\Core\Injector\Injector;
use SilverStripe\Dev\FixtureFactory; use SilverStripe\Dev\FixtureFactory;
use SilverStripe\Dev\SapphireTest; use SilverStripe\Dev\SapphireTest;
use SilverStripe\ORM\DB;
use SilverStripe\ORM\DatabaseAdmin; use SilverStripe\ORM\DatabaseAdmin;
use SilverStripe\ORM\DB;
use SilverStripe\ORM\FieldType\DBDatetime; use SilverStripe\ORM\FieldType\DBDatetime;
use SilverStripe\Versioned\Versioned; use SilverStripe\Versioned\Versioned;
use InvalidArgumentException;
use LogicException;
use Exception;
use stdClass; use stdClass;
/** /**
@ -94,7 +93,7 @@ class TestSessionEnvironment
} }
/** /**
* @return String Absolute path to the file persisting our state. * @return string Absolute path to the file persisting our state.
*/ */
public function getFilePath() public function getFilePath()
{ {
@ -401,8 +400,6 @@ class TestSessionEnvironment
} }
// End test session mode // End test session mode
$this->resetDatabaseName(); $this->resetDatabaseName();
SapphireTest::set_is_running_test(false);
} }
$this->removeStateFile(); $this->removeStateFile();