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

Merge pull request #89 from simonwelsh/master

Browse Source 
Test fixes
This commit is contained in:
Sam Minnée 2011-10-28 19:42:50 -07:00
commit 688e22368d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/tests/LeftAndMainTest.php
View File

@ -24,7 +24,7 @@ class LeftAndMainTest extends FunctionalTest {
public function testSaveTreeNodeSorting() {
$this->loginWithPermission('ADMIN');
$rootPages = DataObject::get('LeftAndMainTest_Object', '"ParentID" = 0'); // implicitly sorted
$rootPages = DataObject::get('LeftAndMainTest_Object', '"ParentID" = 0', '"ID"'); // forcing sorting for non-MySQL
$siblingIDs = $rootPages->column('ID');
$page1 = $rootPages->offsetGet(0);
$page2 = $rootPages->offsetGet(1);
@ -197,4 +197,4 @@ class LeftAndMainTest_Object extends DataObject implements TestOnly {
'Hierarchy'
);
}
}

2
tests/model/DataListTest.php
View File

@ -69,7 +69,7 @@ class DataListTest extends SapphireTest {
}
function testToNestedArray() {
$list = DataList::create('DataObjectTest_TeamComment');
$list = DataList::create('DataObjectTest_TeamComment')->sort('ID');
$nestedArray = $list->toNestedArray();
$expected = array(
0=>

2
tests/security/SecurityTest.php
View File

@ -142,7 +142,7 @@ class SecurityTest extends FunctionalTest {
// Test external redirect
$response = $this->doTestLoginForm('noexpiry@silverstripe.com', '1nitialPassword', 'http://myspoofedhost.com');
$this->assertNotRegExp('/^' . preg_quote('http://myspoofedhost.com', '/') . '/', $response->getHeader('Location'),
$this->assertNotRegExp('/^' . preg_quote('http://myspoofedhost.com', '/') . '/', (string)$response->getHeader('Location'),
"Redirection to external links in login form BackURL gets prevented as a measure against spoofing attacks"
);