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

Merge branch '3.1' into 3.2

This commit is contained in:
Daniel Hensby 2016-06-13 14:33:35 +01:00
parent aca12d1de5 039f6c198f
commit c8976a9d64
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/model/SiteTreeTest.php
View File

@ -947,9 +947,9 @@ class SiteTreeTest extends SapphireTest {
$valid = $classB->doValidate();
$this->assertFalse($valid->valid(), "Doesnt allow child on parents disallowing all children");
$classB->ParentID = $classC->ID;
$classB->ParentID = $classCext->ID;
$valid = $classB->doValidate();
$this->assertFalse($valid->valid(), "Doesnt allow child on parents disallowing all children");
$this->assertTrue($valid->valid(), "Extensions of allowed classes are incorrectly reported as invalid");
$classCext->ParentID = $classD->ID;
$valid = $classCext->doValidate();