From fd198ce0fa13b0dc72168f1ad33fcecdf341bd90 Mon Sep 17 00:00:00 2001
From: James Tancock <tanuck@gmail.com>
Date: Mon, 17 Aug 2015 12:19:02 +0100
Subject: [PATCH] Edits to tests to cover the changes to Model::exists

---
 .../Test/Case/Model/ModelValidationTest.php   | 38 +++++++++++++++++++
 lib/Cake/Test/Case/Model/ModelWriteTest.php   | 11 +-----
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/lib/Cake/Test/Case/Model/ModelValidationTest.php b/lib/Cake/Test/Case/Model/ModelValidationTest.php
index ba81c7199..0edd3fe5f 100644
--- a/lib/Cake/Test/Case/Model/ModelValidationTest.php
+++ b/lib/Cake/Test/Case/Model/ModelValidationTest.php
@@ -554,6 +554,44 @@ class ModelValidationTest extends BaseModelTest {
 		$this->assertEquals($expected, $result);
 	}
 
+/**
+ * test that validates() still performs correctly when useTable = false on the mode.
+ *
+ * @return void
+ */
+	public function testValidatesWithNoTable() {
+		$TestModel = new TheVoid();
+		$TestModel->validate = array(
+			'title' => array(
+				'notEmpty' => array(
+					'rule' => array('notBlank'),
+					'required' => true,
+				),
+				'tooShort' => array(
+					'rule' => array('minLength', 10),
+				),
+			),
+		);
+		$data = array(
+			'TheVoid' => array(
+				'title' => 'too short',
+			),
+		);
+		$TestModel->create($data);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array(
+			'TheVoid' => array(
+				'id' => '1',
+				'title' => 'A good title',
+			),
+		);
+		$TestModel->create($data);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+	}
+
 /**
  * test that validates() checks all the 'with' associations as well for validation
  * as this can cause partial/wrong data insertion.
diff --git a/lib/Cake/Test/Case/Model/ModelWriteTest.php b/lib/Cake/Test/Case/Model/ModelWriteTest.php
index 9ad34df01..63b22ab6c 100644
--- a/lib/Cake/Test/Case/Model/ModelWriteTest.php
+++ b/lib/Cake/Test/Case/Model/ModelWriteTest.php
@@ -2785,18 +2785,9 @@ class ModelWriteTest extends BaseModelTest {
 
 		$TestModel = new TheVoid();
 		$this->assertFalse($TestModel->exists());
-	}
 
-/**
- * testRecordExistsMissingTable method
- *
- * @expectedException PDOException
- * @return void
- */
-	public function testRecordExistsMissingTable() {
-		$TestModel = new TheVoid();
 		$TestModel->id = 5;
-		$TestModel->exists();
+		$this->assertTrue($TestModel->exists());
 	}
 
 /**