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

Only reset test state in SapphireTest if its previously been set

Browse Source 
That's not the case e.g. if the *first* test in a suite
is skipped, so setUp() is never executed completely.
This commit is contained in:
Ingo Schommer 2012-12-14 11:45:26 +01:00
parent 683f388d1c
commit e8f3e7b36e
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dev/SapphireTest.php
View File

@ -460,22 +460,30 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
ini_set('memory_limit', ($this->originalMemoryLimit) ? $this->originalMemoryLimit : -1); ini_set('memory_limit', ($this->originalMemoryLimit) ? $this->originalMemoryLimit : -1);
// Restore email configuration // Restore email configuration
Email::set_mailer($this->originalMailer); if($this->originalMailer) {
$this->originalMailer = null; Email::set_mailer($this->originalMailer);
$this->mailer = null; $this->originalMailer = null;
}
$this->mailer = null;
// Restore password validation // Restore password validation
Member::set_password_validator($this->originalMemberPasswordValidator); if($this->originalMemberPasswordValidator) {
Member::set_password_validator($this->originalMemberPasswordValidator);
}
// Restore requirements // Restore requirements
Requirements::set_backend($this->originalRequirements); if($this->originalRequirements) {
Requirements::set_backend($this->originalRequirements);
}
// Mark test as no longer being run - we use originalIsRunningTest to allow for nested SapphireTest calls // Mark test as no longer being run - we use originalIsRunningTest to allow for nested SapphireTest calls
self::$is_running_test = $this->originalIsRunningTest; self::$is_running_test = $this->originalIsRunningTest;
$this->originalIsRunningTest = null; $this->originalIsRunningTest = null;
// Reset theme setting // Reset theme setting
SSViewer::set_theme($this->originalTheme); if($this->originalTheme) {
SSViewer::set_theme($this->originalTheme);
}
// Reset mocked datetime // Reset mocked datetime
SS_Datetime::clear_mock_now(); SS_Datetime::clear_mock_now();