From b4ff056bc8ec0065076c4826e2c66595c9230000 Mon Sep 17 00:00:00 2001 From: dogmatic69 Date: Sat, 29 Sep 2012 14:26:14 +0100 Subject: [PATCH] fixing a few tests --- Core/Contact/Test/Case/Model/TimeZoneTest.php | 2 +- .../Test/Case/Model/GlobalPageTest.php | 4 +--- .../Test/Fixture/GlobalContentFixture.php | 2 +- .../Test/Fixture/GlobalPageFixture.php | 20 ------------------- 4 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 Core/Contents/Test/Fixture/GlobalPageFixture.php diff --git a/Core/Contact/Test/Case/Model/TimeZoneTest.php b/Core/Contact/Test/Case/Model/TimeZoneTest.php index 67df0aae2..1811fe4cf 100644 --- a/Core/Contact/Test/Case/Model/TimeZoneTest.php +++ b/Core/Contact/Test/Case/Model/TimeZoneTest.php @@ -13,7 +13,7 @@ class TimeZoneTest extends CakeTestCase { * @var array */ public $fixtures = array( - 'plugin.contact.time_zone' + //'plugin.contact.time_zone' ); /** diff --git a/Core/Contents/Test/Case/Model/GlobalPageTest.php b/Core/Contents/Test/Case/Model/GlobalPageTest.php index 79fcac344..9781752d5 100644 --- a/Core/Contents/Test/Case/Model/GlobalPageTest.php +++ b/Core/Contents/Test/Case/Model/GlobalPageTest.php @@ -12,9 +12,7 @@ class GlobalPageTest extends CakeTestCase { * * @var array */ - public $fixtures = array( - 'plugin.contents.global_page' - ); + public $fixtures = array(); /** * setUp method diff --git a/Core/Contents/Test/Fixture/GlobalContentFixture.php b/Core/Contents/Test/Fixture/GlobalContentFixture.php index 3e99f2cff..47d297517 100644 --- a/Core/Contents/Test/Fixture/GlobalContentFixture.php +++ b/Core/Contents/Test/Fixture/GlobalContentFixture.php @@ -26,7 +26,7 @@ class GlobalContentFixture extends CakeTestFixture { 'group_id' => array('type' => 'string', 'null' => false, 'default' => '0', 'length' => 36, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'), 'layout_id' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 36, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'), 'author_id' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 36, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'), - 'author_alias' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 50, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'), + 'author_alias' => array('type' => 'string', 'null' => false, 'default' => '', 'length' => 50, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'), 'editor_id' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 36, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'), 'editor_alias' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 50, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'), 'canonical_url' => array('type' => 'text', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'), diff --git a/Core/Contents/Test/Fixture/GlobalPageFixture.php b/Core/Contents/Test/Fixture/GlobalPageFixture.php deleted file mode 100644 index b2a288d06..000000000 --- a/Core/Contents/Test/Fixture/GlobalPageFixture.php +++ /dev/null @@ -1,20 +0,0 @@ - array( - - ), - 'tableParameters' => array() - ); - - public $records = array( - ); -} \ No newline at end of file