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

BUGFIX Fixing SecurityTest to clear any custom settings in Security::$force_database_is_ready before making assertions

Browse Source
This commit is contained in:
Ingo Schommer 2010-12-06 12:12:44 +13:00
parent 5755c27c30
commit a7e9be3bc4
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/security/SecurityTest.php
View File

@ -340,6 +340,9 @@ class SecurityTest extends FunctionalTest {
} }
function testDatabaseIsReadyWithInsufficientMemberColumns() { function testDatabaseIsReadyWithInsufficientMemberColumns() {
$old = Security::$force_database_is_ready;
Security::$force_database_is_ready = null;
// Assumption: The database has been built correctly by the test runner, // Assumption: The database has been built correctly by the test runner,
// and has all columns present in the ORM // and has all columns present in the ORM
DB::getConn()->renameField('Member', 'Email', 'Email_renamed'); DB::getConn()->renameField('Member', 'Email', 'Email_renamed');
@ -350,6 +353,8 @@ class SecurityTest extends FunctionalTest {
// Rebuild the database (which re-adds the Email column), and try again // Rebuild the database (which re-adds the Email column), and try again
$this->resetDBSchema(true); $this->resetDBSchema(true);
$this->assertTrue(Security::database_is_ready()); $this->assertTrue(Security::database_is_ready());
Security::$force_database_is_ready = $old;
} }
/** /**