浏览代码

fix tests

euromark 12 年之前
父节点
当前提交
ec6d1f6df1

+ 1 - 1
Model/Behavior/SoftDeleteBehavior.php

@@ -313,7 +313,7 @@ class SoftDeleteBehavior extends ModelBehavior {
 
 
 				foreach ($model->{$parentModel}->{$assocType} as $assoc => $assocConfig) {
 				foreach ($model->{$parentModel}->{$assocType} as $assoc => $assocConfig) {
 					$modelName = !empty($assocConfig['className']) ? $assocConfig['className'] : $assoc;
 					$modelName = !empty($assocConfig['className']) ? $assocConfig['className'] : $assoc;
-					if ($model->alias != $modelName) {
+					if ($model->alias !== $modelName) {
 						continue;
 						continue;
 					}
 					}
 
 

+ 5 - 5
Test/Case/Model/Behavior/LogableBehaviorTest.php

@@ -150,16 +150,16 @@ class LogableBehaviorTest extends CakeTestCase {
 
 
 	public function testFindUserActions() {
 	public function testFindUserActions() {
 		$expected = array(
 		$expected = array(
-			0 => array('LogableLog' => array('id' => 5)),
-			1 => array('LogableLog' => array('id' => 3))
+			0 => array('LogableLog' => array('id' => 3)),
+			1 => array('LogableLog' => array('id' => 5))
 		);
 		);
 		$result = $this->LogableBook->findUserActions(301, array('fields' => 'id'));
 		$result = $this->LogableBook->findUserActions(301, array('fields' => 'id'));
 		$this->assertEquals($expected, $result);
 		$this->assertEquals($expected, $result);
 
 
 		$expected = array(
 		$expected = array(
-			0 => array('LogableLog' => array('id' => 4, 'event' => 'Alexander deleted the logablebook(id 6)')),
-			1 => array('LogableLog' => array('id' => 2, 'event' => 'Alexander edited title of logablebook(id 6)')),
-			2 => array('LogableLog' => array('id' => 1, 'event' => 'Alexander added a logablebook(id 6)'))
+			array('LogableLog' => array('id' => 1, 'event' => 'Alexander added a logablebook(id 6)')),
+			array('LogableLog' => array('id' => 4, 'event' => 'Alexander deleted the logablebook(id 6)')),
+			array('LogableLog' => array('id' => 2, 'event' => 'Alexander edited title of logablebook(id 6)')),
 		);
 		);
 		$result = $this->LogableBook->findUserActions(66, array('events' => true));
 		$result = $this->LogableBook->findUserActions(66, array('events' => true));
 		$this->assertEquals($expected, $result);
 		$this->assertEquals($expected, $result);

+ 1 - 1
Test/Case/Model/Behavior/SluggedBehaviorTest.php

@@ -599,7 +599,7 @@ class SluggedBehaviorTest extends CakeTestCase {
 		$decCode = hexdec($hexCode);
 		$decCode = hexdec($hexCode);
 		$display = $char = html_entity_decode('&#' . $decCode . ';', ENT_NOQUOTES, 'UTF-8');
 		$display = $char = html_entity_decode('&#' . $decCode . ';', ENT_NOQUOTES, 'UTF-8');
 		$char = $this->Model->slug($char, false);
 		$char = $this->Model->slug($char, false);
-		if ($display == $char) {
+		if ($display === $char) {
 			if ($mode === 'display') {
 			if ($mode === 'display') {
 				return "<a href='#' title='$hexCode-$decCode'>$display</a>";
 				return "<a href='#' title='$hexCode-$decCode'>$display</a>";
 			} elseif ($mode === 'url') {
 			} elseif ($mode === 'url') {