mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
BUGFIX Re-added test classes to DataObjectSet (lost during mergeback)
BUGFIX Removed duplicate GroupTest.php files git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60378 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
3574d3c3b6
commit
22023325cb
@ -244,4 +244,24 @@ class DataObjectTest extends SapphireTest {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class DataObjectTest_Player extends Member implements TestOnly {
|
||||||
|
|
||||||
|
static $belongs_many_many = array(
|
||||||
|
'Teams' => 'DataObjectTest_Team'
|
||||||
|
);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
class DataObjectTest_Team extends DataObject implements TestOnly {
|
||||||
|
|
||||||
|
static $db = array(
|
||||||
|
'Title' => 'Text',
|
||||||
|
);
|
||||||
|
|
||||||
|
static $many_many = array(
|
||||||
|
'Players' => 'DataObjectTest_Player'
|
||||||
|
);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
@ -1,96 +0,0 @@
|
|||||||
<?php
|
|
||||||
/**
|
|
||||||
* @package sapphire
|
|
||||||
* @subpackage testing
|
|
||||||
*/
|
|
||||||
class GroupTest extends FunctionalTest {
|
|
||||||
|
|
||||||
static $fixture_file = 'sapphire/tests/GroupTest.yml';
|
|
||||||
|
|
||||||
function testMemberGroupRelationForm() {
|
|
||||||
$adminGroup = $this->fixture->objFromFixture('Group', 'admingroup');
|
|
||||||
$parentGroup = $this->fixture->objFromFixture('Group', 'parentgroup');
|
|
||||||
$childGroup = $this->fixture->objFromFixture('Group', 'childgroup');
|
|
||||||
|
|
||||||
// Test single group relation through checkboxsetfield
|
|
||||||
$form = new GroupTest_MemberForm($this, 'Form');
|
|
||||||
$member = $this->fixture->objFromFixture('GroupTest_Member', 'admin');
|
|
||||||
$form->loadDataFrom($member);
|
|
||||||
$checkboxSetField = $form->Fields()->fieldByName('Groups');
|
|
||||||
$checkboxSetField->setValue(array(
|
|
||||||
$adminGroup->ID => $adminGroup->ID, // keep existing relation
|
|
||||||
$parentGroup->ID => $parentGroup->ID, // add new relation
|
|
||||||
));
|
|
||||||
$form->saveInto($member);
|
|
||||||
$updatedGroups = $member->Groups();
|
|
||||||
$controlGroups = new Member_GroupSet(
|
|
||||||
$adminGroup,
|
|
||||||
$parentGroup
|
|
||||||
);
|
|
||||||
$this->assertEquals(
|
|
||||||
$updatedGroups->Map('ID','ID'),
|
|
||||||
$controlGroups->Map('ID','ID'),
|
|
||||||
"Adding a toplevel group works"
|
|
||||||
);
|
|
||||||
|
|
||||||
// Test unsetting relationship
|
|
||||||
$form->loadDataFrom($member);
|
|
||||||
$checkboxSetField = $form->Fields()->fieldByName('Groups');
|
|
||||||
$checkboxSetField->setValue(array(
|
|
||||||
$adminGroup->ID => $adminGroup->ID, // keep existing relation
|
|
||||||
//$parentGroup->ID => $parentGroup->ID, // remove previously set relation
|
|
||||||
));
|
|
||||||
$form->saveInto($member);
|
|
||||||
$member->flushCache();
|
|
||||||
$updatedGroups = $member->Groups();
|
|
||||||
$controlGroups = new Member_GroupSet(
|
|
||||||
$adminGroup
|
|
||||||
);
|
|
||||||
$this->assertEquals(
|
|
||||||
$updatedGroups->Map('ID','ID'),
|
|
||||||
$controlGroups->Map('ID','ID'),
|
|
||||||
"Removing a previously added toplevel group works"
|
|
||||||
);
|
|
||||||
|
|
||||||
// Test adding child group
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
class GroupTest_Member extends Member implements TestOnly {
|
|
||||||
|
|
||||||
function getCMSFields() {
|
|
||||||
$groups = DataObject::get('Group');
|
|
||||||
$groupsMap = ($groups) ? $groups->toDropDownMap() : false;
|
|
||||||
$fields = new FieldSet(
|
|
||||||
new HiddenField('ID', 'ID'),
|
|
||||||
new CheckboxSetField(
|
|
||||||
'Groups',
|
|
||||||
'Groups',
|
|
||||||
$groupsMap
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
return $fields;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
class GroupTest_MemberForm extends Form {
|
|
||||||
|
|
||||||
function __construct($controller, $name) {
|
|
||||||
$fields = singleton('GroupTest_Member')->getCMSFields();
|
|
||||||
$actions = new FieldSet(
|
|
||||||
new FormAction('doSave','save')
|
|
||||||
);
|
|
||||||
|
|
||||||
parent::__construct($controller, $name, $fields, $actions);
|
|
||||||
}
|
|
||||||
|
|
||||||
function doSave($data, $form) {
|
|
||||||
// done in testing methods
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
?>
|
|
@ -1,21 +0,0 @@
|
|||||||
Group:
|
|
||||||
admingroup:
|
|
||||||
Code: admingroup
|
|
||||||
parentgroup:
|
|
||||||
Code: parentgroup
|
|
||||||
childgroup:
|
|
||||||
Code: childgroup
|
|
||||||
Parent: =>Group.parentgroup
|
|
||||||
GroupTest_Member:
|
|
||||||
admin:
|
|
||||||
FirstName: Admin
|
|
||||||
Groups: =>Group.admingroup
|
|
||||||
parentgroupuser:
|
|
||||||
FirstName: Parent Group User
|
|
||||||
Groups: =>Group.parentgroup
|
|
||||||
childgroupuser:
|
|
||||||
FirstName: Child Group User
|
|
||||||
Groups: =>Group.childgroup
|
|
||||||
allgroupuser:
|
|
||||||
FirstName: All Group User
|
|
||||||
Groups: =>Group.admingroup,=>Group.parentgroup,=>Group.childgroup
|
|
Loading…
x
Reference in New Issue
Block a user