Making BehaviorCollection more consistent with other object collections.

Fixing failing tests caused by not being updated when behavior changed.
This commit is contained in:
mark_story 2010-11-21 14:42:13 -05:00
parent cb657b158b
commit 8aabf3689e
2 changed files with 4 additions and 4 deletions

View file

@ -64,8 +64,8 @@ class BehaviorCollection extends ObjectCollection {
$this->modelName = $modelName;
if (!empty($behaviors)) {
foreach (Set::normalize($behaviors) as $behavior => $config) {
$this->load($behavior, $config);
foreach (BehaviorCollection::normalizeObjectArray($behaviors) as $behavior => $config) {
$this->load($config['class'], $config['settings']);
}
}
}

View file

@ -1309,12 +1309,12 @@ class ModelIntegrationTest extends BaseModelTest {
$this->loadFixtures('Post');
$TestModel = ClassRegistry::init('MergeVarPluginPost');
$this->assertEqual($TestModel->actsAs, array('Containable', 'Tree'));
$this->assertEqual($TestModel->actsAs, array('Containable' => null, 'Tree' => null));
$this->assertTrue(isset($TestModel->Behaviors->Containable));
$this->assertTrue(isset($TestModel->Behaviors->Tree));
$TestModel = ClassRegistry::init('MergeVarPluginComment');
$expected = array('Containable', 'Containable' => array('some_settings'));
$expected = array('Containable' => array('some_settings'));
$this->assertEqual($TestModel->actsAs, $expected);
$this->assertTrue(isset($TestModel->Behaviors->Containable));
}