浏览代码

Merge remote-tracking branch 'remotes/composer/cake3-fix-rc1-broken-stuff' into cake3

Conflicts:
	src/Model/Behavior/BitmaskedBehavior.php
	tests/TestCase/Model/Behavior/BitmaskedBehaviorTest.php
Mark Scherer 11 年之前
父节点
当前提交
f03ccfa952
共有 1 个文件被更改,包括 4 次插入0 次删除
  1. 4 0
      tests/TestCase/Model/Behavior/BitmaskedBehaviorTest.php

+ 4 - 0
tests/TestCase/Model/Behavior/BitmaskedBehaviorTest.php

@@ -90,6 +90,8 @@ class BitmaskedBehaviorTest extends TestCase {
 
 		// save + find
 		$entity = $this->Comments->newEntity($data);
+		$this->assertEmpty($entity->errors());
+
 		$res = $this->Comments->save($entity);
 		$this->assertTrue((bool)$res);
 
@@ -167,6 +169,8 @@ class BitmaskedBehaviorTest extends TestCase {
 			'statuses' => array(BitmaskedComment::STATUS_PUBLISHED, BitmaskedComment::STATUS_APPROVED),
 		);
 		$entity = $this->Comments->newEntity($data);
+		$this->assertEmpty($entity->errors());
+
 		$res = $this->Comments->save($entity);
 		$this->assertTrue((bool)$res);
 		$this->assertSame(BitmaskedComment::STATUS_PUBLISHED | BitmaskedComment::STATUS_APPROVED, $res['status']);