The branch, master has been updated
via 66f38160ea85f179d33563a450aca0919d624f74 (commit)
via 3b2c4dd0db23ec7a26d5df8a2474aebfff1d37c7 (commit)
from eddbee7e73b13b621e573621edc0d613cc863ac8 (commit)
- Log -----------------------------------------------------------------
commit 66f38160ea85f179d33563a450aca0919d624f74
Author: Michal Čihař <[email protected]>
Date: Mon Dec 19 15:03:19 2011 +0100
Fix runinng more testcases (neeeds clean environment)
commit 3b2c4dd0db23ec7a26d5df8a2474aebfff1d37c7
Author: Michal Čihař <[email protected]>
Date: Mon Dec 19 15:02:00 2011 +0100
Fix condition (it returns actual value)
-----------------------------------------------------------------------
Summary of changes:
test/classes/PMA_List_Database_test.php | 2 +-
test/libraries/PMA_sanitize_test.php | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/test/classes/PMA_List_Database_test.php
b/test/classes/PMA_List_Database_test.php
index 24e7a11..7bd9481 100644
--- a/test/classes/PMA_List_Database_test.php
+++ b/test/classes/PMA_List_Database_test.php
@@ -28,7 +28,7 @@ class PMA_List_Database_test extends
PHPUnit_Framework_TestCase
public function testSingle()
{
$arr = new PMA_List_Database;
- $this->assertEquals(true, $arr->getSingleItem());
+ $this->assertEquals('single_db', $arr->getSingleItem());
}
public function testExists()
diff --git a/test/libraries/PMA_sanitize_test.php
b/test/libraries/PMA_sanitize_test.php
index 23bf6de..c4cde4d 100644
--- a/test/libraries/PMA_sanitize_test.php
+++ b/test/libraries/PMA_sanitize_test.php
@@ -36,6 +36,7 @@ class PMA_sanitize_test extends PHPUnit_Framework_TestCase
{
unset($GLOBALS['server']);
unset($GLOBALS['lang']);
+ unset($GLOBALS['collation_connection']);
$this->assertEquals('<a
href="./url.php?url=http%3A%2F%2Fwww.phpmyadmin.net%2F&token=token"
target="target">link</a>',
PMA_sanitize('[a@http://www.phpmyadmin.net/@target]link[/a]'));
}
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
Learn Windows Azure Live! Tuesday, Dec 13, 2011
Microsoft is holding a special Learn Windows Azure training event for
developers. It will provide a great way to learn Windows Azure and what it
provides. You can attend the event by watching it streamed LIVE online.
Learn more at http://p.sf.net/sfu/ms-windowsazure
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
