Fixed more unit tests

cakephp · Mar 22, 2014 · f31bb87 · f31bb87
1 parent edcaeea
commit f31bb87
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/tests/TestCase/ORM/Association/BelongsToTest.php b/tests/TestCase/ORM/Association/BelongsToTest.php
@@ -99,7 +99,7 @@ public function testAttachTo() {
 				'conditions' => new QueryExpression([
 					'Companies.is_active' => true,
 					['Companies.id' => $field]
-				]),
+				], ['Companies.id' => 'integer']),
 				'table' => 'companies',
 				'type' => 'LEFT'
 			]
@@ -164,7 +164,7 @@ public function testAttachToNoFields() {
 				'conditions' => new QueryExpression([
 					'Companies.is_active' => true,
 					['Companies.id' => $field]
-				]),
+				], ['Companies.id' => 'integer']),
 				'type' => 'LEFT',
 				'table' => 'companies',
 			]
@@ -191,10 +191,10 @@ public function testAttachToWithQueryBuilder() {
 		$query->expects($this->once())->method('join')->with([
 			'Companies' => [
 				'conditions' => new QueryExpression([
+					'a' => 1,
 					'Companies.is_active' => true,
-					['Companies.id' => $field],
-					new QueryExpression(['a' => 1])
-				]),
+					['Companies.id' => $field]
+				], ['Companies.id' => 'integer']),
 				'type' => 'LEFT',
 				'table' => 'companies',
 			]
@@ -231,7 +231,7 @@ public function testAttachToMatching() {
 				'conditions' => new QueryExpression([
 					'Companies.is_active' => true,
 					['Companies.id' => $field]
-				]),
+				], ['Companies.id' => 'integer']),
 				'table' => 'companies',
 				'type' => 'INNER'
 			]
@@ -313,7 +313,7 @@ public function testAttachToMultiPrimaryKey() {
 				'conditions' => new QueryExpression([
 					'Companies.is_active' => true,
 					['Companies.id' => $field1, 'Companies.tenant_id' => $field2]
-				]),
+				], ['Companies.id' => 'integer']),
 				'table' => 'companies',
 				'type' => 'LEFT'
 			]

diff --git a/tests/TestCase/ORM/Association/HasManyTest.php b/tests/TestCase/ORM/Association/HasManyTest.php
@@ -631,9 +631,9 @@ public function testAttachToWithQueryBuilder() {
 		$query->expects($this->once())->method('join')->with([
 			'Articles' => [
 				'conditions' => new QueryExpression([
+					'a' => 1,
 					'Articles.is_active' => true,
 					['Authors.id' => $field],
-					new QueryExpression(['a' => 1])
 				]),
 				'type' => 'INNER',
 				'table' => 'articles'

diff --git a/tests/TestCase/ORM/Association/HasOneTest.php b/tests/TestCase/ORM/Association/HasOneTest.php
@@ -193,9 +193,9 @@ public function testAttachToWithQueryBuilder() {
 		$query->expects($this->once())->method('join')->with([
 			'Profiles' => [
 				'conditions' => new QueryExpression([
+					'a' => 1,
 					'Profiles.is_active' => true,
 					['Users.id' => $field],
-					new QueryExpression(['a' => 1])
 				]),
 				'type' => 'INNER',
 				'table' => 'profiles'