Fixing failing tests from merge with 1.3. Most tests were failing due to internal changes and PHPUnit being more specific than SimpleTest.

This commit is contained in:
Mark Story 2010-10-31 22:42:16 -04:00
parent a3da915abd
commit 94f9f7afeb
3 changed files with 3 additions and 5 deletions

View file

@ -759,7 +759,7 @@ class ControllerTest extends CakeTestCase {
function testPaginateFieldsDouble(){
$Controller =& new Controller();
$Controller->uses = array('ControllerPost');
$Controller->params['url'] = array();
$Controller->request->params['url'] = array();
$Controller->constructClasses();
$Controller->paginate = array(

View file

@ -631,7 +631,7 @@ class CakeSchemaTest extends CakeTestCase {
* @return void
*/
function testSchemaReadWithConfigPrefix() {
$db =& ConnectionManager::getDataSource('test_suite');
$db =& ConnectionManager::getDataSource('test');
$config = $db->config;
$config['prefix'] = 'schema_test_prefix_';
ConnectionManager::create('schema_prefix', $config);

View file

@ -1,6 +1,4 @@
<?php
/* SVN FILE: $Id: model.test.php 8225 2009-07-08 03:25:30Z mark_story $ */
/**
* ModelWriteTest file
*
@ -2181,7 +2179,7 @@ class ModelWriteTest extends BaseModelTest {
'title' => '',
'body' => ''
));
$this->assertTrue($result);
$this->assertTrue((bool)$result);
$result = $Article->find('first', array('conditions' => array('Article.id' => 1)));
$this->assertEqual('', $result['Article']['title'], 'Title is not blank');
$this->assertEqual('', $result['Article']['body'], 'Body is not blank');