Fixing issues where ModelBehavior::detach() would not detach behavior…

…s when a plugin.name was provided. This change makes detach() work like attach(). Tests added. Fixes #711
cakephp · May 12, 2010 · 79839c0 · 79839c0
1 parent 0648c66
commit 79839c0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/cake/libs/model/model_behavior.php b/cake/libs/model/model_behavior.php
@@ -372,6 +372,7 @@ function attach($behavior, $config = array()) {
  * @access public
  */
 	function detach($name) {
+		list($plugin, $name) = pluginSplit($name);
 		if (isset($this->{$name})) {
 			$this->{$name}->cleanup(ClassRegistry::getObject($this->modelName));
 			unset($this->{$name});

diff --git a/cake/tests/cases/libs/model/model_behavior.test.php b/cake/tests/cases/libs/model/model_behavior.test.php
@@ -504,6 +504,28 @@ function testBehaviorBinding() {
 		$this->assertEqual($Apple->Behaviors->Test->settings['Apple'], $expected);
 	}
 
+/**
+ * test that attach()/detach() works with plugin.banana
+ *
+ * @return void
+ */
+	function testDetachWithPluginNames() {
+		$Apple = new Apple();
+		$Apple->Behaviors->attach('Plugin.Test');
+		$this->assertTrue(isset($Apple->Behaviors->Test), 'Missing behavior');
+		$this->assertEqual($Apple->Behaviors->attached(), array('Test'));
+
+		$Apple->Behaviors->detach('Plugin.Test');
+		$this->assertEqual($Apple->Behaviors->attached(), array());
+
+		$Apple->Behaviors->attach('Plugin.Test');
+		$this->assertTrue(isset($Apple->Behaviors->Test), 'Missing behavior');
+		$this->assertEqual($Apple->Behaviors->attached(), array('Test'));
+
+		$Apple->Behaviors->detach('Test');
+		$this->assertEqual($Apple->Behaviors->attached(), array());
+	}
+
 /**
  * test that attaching a non existant Behavior triggers a cake error.
  *