From 64f34b75a23bea07c896a0c1d11d5864f30ffa0c Mon Sep 17 00:00:00 2001
From: Ber Clausen <crashcookie@gmail.com>
Date: Sat, 9 Nov 2013 04:20:11 -0300
Subject: [PATCH] Fix a couple of failing tests.
---
.../Test/Case/Model/Datasource/Database/MysqlTest.php | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
index 105ab1bf5..1bdae69ed 100644
--- a/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
+++ b/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
@@ -1981,8 +1981,9 @@ class MysqlTest extends CakeTestCase {
$expected = " WHERE SUM(`Post`.`comments_count`) > 500";
$this->assertEquals($expected, $result);
- $result = $this->Dbo->conditions("(Post.created < '" . date('Y-m-d H:i') . "') GROUP BY YEAR(Post.created), MONTH(Post.created)");
- $expected = " WHERE (`Post`.`created` < '" . date('Y-m-d H:i') . "') GROUP BY YEAR(`Post`.`created`), MONTH(`Post`.`created`)";
+ $date = date('Y-m-d H:i');
+ $result = $this->Dbo->conditions("(Post.created < '" . $date . "') GROUP BY YEAR(Post.created), MONTH(Post.created)");
+ $expected = " WHERE (`Post`.`created` < '" . $date . "') GROUP BY YEAR(`Post`.`created`), MONTH(`Post`.`created`)";
$this->assertEquals($expected, $result);
$result = $this->Dbo->conditions("score BETWEEN 90.1 AND 95.7");
@@ -1997,8 +1998,9 @@ class MysqlTest extends CakeTestCase {
$expected = " WHERE `Aro`.`rght` = `Aro`.`lft` + 1.1";
$this->assertEquals($expected, $result);
- $result = $this->Dbo->conditions("(Post.created < '" . date('Y-m-d H:i:s') . "') GROUP BY YEAR(Post.created), MONTH(Post.created)");
- $expected = " WHERE (`Post`.`created` < '" . date('Y-m-d H:i:s') . "') GROUP BY YEAR(`Post`.`created`), MONTH(`Post`.`created`)";
+ $date = date('Y-m-d H:i:s');
+ $result = $this->Dbo->conditions("(Post.created < '" . $date . "') GROUP BY YEAR(Post.created), MONTH(Post.created)");
+ $expected = " WHERE (`Post`.`created` < '" . $date . "') GROUP BY YEAR(`Post`.`created`), MONTH(`Post`.`created`)";
$this->assertEquals($expected, $result);
$result = $this->Dbo->conditions('Sportstaette.sportstaette LIKE "%ru%" AND Sportstaette.sportstaettenart_id = 2');