mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 03:18:26 +00:00
Merge branch '1.3-newlines' into 1.3
This commit is contained in:
gwoo
commit
d118c6a764
27 changed files with 227 additions and 86 deletions
|
|
@ -47,7 +47,7 @@ class ApiShell extends Shell {
|
|||
*
|
||||
* @access public
|
||||
*/
|
||||
function initialize () {
|
||||
function initialize() {
|
||||
$this->paths = array_merge($this->paths, array(
|
||||
'behavior' => LIBS . 'model' . DS . 'behaviors' . DS,
|
||||
'cache' => LIBS . 'cache' . DS,
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
<?php echo $html->charset(); ?>
|
||||
<title><?php echo $page_title; ?></title>
|
||||
|
||||
|
||||
<?php if (Configure::read() == 0) { ?>
|
||||
<meta http-equiv="Refresh" content="<?php echo $pause?>;url=<?php echo $url?>"/>
|
||||
<?php } ?>
|
||||
|
|
|
|||
|
|
@ -746,7 +746,7 @@ class CakeSession extends Object {
|
|||
return false;
|
||||
}
|
||||
|
||||
return $row[$model->alias]['data'];
|
||||
return $row[$model->alias]['data'];
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -581,7 +581,7 @@ class RequestHandlerComponent extends Object {
|
|||
} elseif (count($types) === 1) {
|
||||
return ($types[0] === $accepts[0]);
|
||||
} elseif (count($accepts) === 1) {
|
||||
return $accepts[0];
|
||||
return $accepts[0];
|
||||
}
|
||||
|
||||
$acceptedTypes = array();
|
||||
|
|
|
|||
|
|
@ -165,7 +165,6 @@ class Debugger extends Object {
|
|||
$this->_templates['js']['code'] = '<div id="{:id}-code" class="cake-code-dump" ';
|
||||
$this->_templates['js']['code'] .= 'style="display: none;"><pre>{:code}</pre></div>';
|
||||
|
||||
|
||||
$e = '<pre class="cake-debug"><b>{:error}</b> ({:code}) : {:description} ';
|
||||
$e .= '[<b>{:path}</b>, line <b>{:line}]</b></pre>';
|
||||
$this->_templates['html']['error'] = $e;
|
||||
|
|
|
|||
|
|
@ -366,7 +366,6 @@ class CakeSchema extends Object {
|
|||
}
|
||||
$out .="}\n";
|
||||
|
||||
|
||||
$File =& new File($path . DS . $file, true);
|
||||
$header = '$Id';
|
||||
$content = "<?php \n/* SVN FILE: {$header}$ */\n/* {$name} schema generated on: " . date('Y-m-d H:m:s') . " : ". time() . "*/\n{$out}?>";
|
||||
|
|
|
|||
|
|
@ -204,10 +204,11 @@ class DboOracle extends DboSource {
|
|||
}
|
||||
return $this->connected;
|
||||
}
|
||||
/**
|
||||
* Keeps track of the most recent Oracle error
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* Keeps track of the most recent Oracle error
|
||||
*
|
||||
*/
|
||||
function _setError($source = null, $clear = false) {
|
||||
if ($source) {
|
||||
$e = ocierror($source);
|
||||
|
|
@ -1072,7 +1073,6 @@ class DboOracle extends DboSource {
|
|||
$q = str_replace('= (', 'IN (', $q);
|
||||
$q = str_replace(' WHERE 1 = 1', '', $q);
|
||||
|
||||
|
||||
$q = $this->insertQueryData($q, null, $association, $assocData, $model, $linkModel, $stack);
|
||||
if ($q != false) {
|
||||
$res = $this->fetchAll($q, $model->cacheQueries, $model->alias);
|
||||
|
|
@ -1142,14 +1142,15 @@ class DboOracle extends DboSource {
|
|||
}
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Generate a "drop table" statement for the given Schema object
|
||||
*
|
||||
* @param object $schema An instance of a subclass of CakeSchema
|
||||
* @param string $table Optional. If specified only the table name given will be generated.
|
||||
* Otherwise, all tables defined in the schema are generated.
|
||||
* @return string
|
||||
*/
|
||||
|
||||
/**
|
||||
* Generate a "drop table" statement for the given Schema object
|
||||
*
|
||||
* @param object $schema An instance of a subclass of CakeSchema
|
||||
* @param string $table Optional. If specified only the table name given will be generated.
|
||||
* Otherwise, all tables defined in the schema are generated.
|
||||
* @return string
|
||||
*/
|
||||
function dropSchema($schema, $table = null) {
|
||||
if (!is_a($schema, 'CakeSchema')) {
|
||||
trigger_error(__('Invalid schema object', true), E_USER_WARNING);
|
||||
|
|
|
|||
|
|
@ -1063,7 +1063,7 @@ class Multibyte extends Object {
|
|||
* @return string
|
||||
* @access private
|
||||
*/
|
||||
function __codepoint ($decimal) {
|
||||
function __codepoint($decimal) {
|
||||
if ($decimal > 128 && $decimal < 256) {
|
||||
$return = '0080_00ff'; // Latin-1 Supplement
|
||||
} elseif ($decimal < 384) {
|
||||
|
|
|
|||
|
|
@ -45,12 +45,12 @@ class Security extends Object {
|
|||
var $hashType = null;
|
||||
|
||||
/**
|
||||
* Singleton implementation to get object instance.
|
||||
*
|
||||
* @return object
|
||||
* @access public
|
||||
* @static
|
||||
*/
|
||||
* Singleton implementation to get object instance.
|
||||
*
|
||||
* @return object
|
||||
* @access public
|
||||
* @static
|
||||
*/
|
||||
function &getInstance() {
|
||||
static $instance = array();
|
||||
if (!$instance) {
|
||||
|
|
@ -60,12 +60,12 @@ class Security extends Object {
|
|||
}
|
||||
|
||||
/**
|
||||
* Get allowed minutes of inactivity based on security level.
|
||||
*
|
||||
* @return integer Allowed inactivity in minutes
|
||||
* @access public
|
||||
* @static
|
||||
*/
|
||||
* Get allowed minutes of inactivity based on security level.
|
||||
*
|
||||
* @return integer Allowed inactivity in minutes
|
||||
* @access public
|
||||
* @static
|
||||
*/
|
||||
function inactiveMins() {
|
||||
$_this =& Security::getInstance();
|
||||
switch (Configure::read('Security.level')) {
|
||||
|
|
@ -83,12 +83,12 @@ class Security extends Object {
|
|||
}
|
||||
|
||||
/**
|
||||
* Generate authorization hash.
|
||||
*
|
||||
* @return string Hash
|
||||
* @access public
|
||||
* @static
|
||||
*/
|
||||
* Generate authorization hash.
|
||||
*
|
||||
* @return string Hash
|
||||
* @access public
|
||||
* @static
|
||||
*/
|
||||
function generateAuthKey() {
|
||||
if (!class_exists('String')) {
|
||||
App::import('Core', 'String');
|
||||
|
|
|
|||
|
|
@ -422,7 +422,7 @@ class Set extends Object {
|
|||
$context['key'] = array_pop($context['trace']);
|
||||
if (isset($context['trace'][1]) && $context['trace'][1] > 0) {
|
||||
$context['item'] = $context['item'][0];
|
||||
} else if(!empty($context['item'][$key])){
|
||||
} elseif (!empty($context['item'][$key])) {
|
||||
$context['item'] = $context['item'][$key];
|
||||
} else {
|
||||
$context['item'] = array_shift($context['item']);
|
||||
|
|
|
|||
|
|
@ -778,7 +778,7 @@ class Validation extends Object {
|
|||
* @return boolean Success
|
||||
* @access public
|
||||
*/
|
||||
function range($check, $lower = null, $upper = null ) {
|
||||
function range($check, $lower = null, $upper = null) {
|
||||
if (!is_numeric($check)) {
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -508,7 +508,6 @@ class AjaxHelper extends AppHelper {
|
|||
$options = $this->_optionsToString($options, array('paramName', 'indicator'));
|
||||
$options = $this->_buildOptions($options, $this->autoCompleteOptions);
|
||||
|
||||
|
||||
$text = $this->Form->text($field, $htmlOptions);
|
||||
$div = $this->Html->div(null, '', $divOptions);
|
||||
$script = "{$var}new Ajax.Autocompleter('{$htmlOptions['id']}', '{$divOptions['id']}', '";
|
||||
|
|
@ -903,7 +902,7 @@ class AjaxHelper extends AppHelper {
|
|||
|
||||
$callback = $this->remoteFunction($options);
|
||||
$hasFrequency = !(!isset($options['frequency']) || intval($options['frequency']) == 0);
|
||||
$frequency = $hasFrequency ? $options['frequency'] . ', ' : '';
|
||||
$frequency = $hasFrequency ? $options['frequency'] . ', ' : '';
|
||||
|
||||
return "new $klass('$name', {$frequency}function(element, value) {{$callback}})";
|
||||
}
|
||||
|
|
@ -1018,5 +1017,4 @@ class AjaxHelper extends AppHelper {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
||||
|
|
@ -168,5 +168,4 @@ class XmlHelper extends AppHelper {
|
|||
return $data->toString($options + array('header' => false));
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
||||
|
|
@ -58,7 +58,7 @@ class ThemeView extends View {
|
|||
*
|
||||
* @param unknown_type $controller
|
||||
*/
|
||||
function __construct (&$controller) {
|
||||
function __construct(&$controller) {
|
||||
parent::__construct($controller);
|
||||
$this->theme =& $controller->theme;
|
||||
|
||||
|
|
|
|||
|
|
@ -225,7 +225,6 @@ class ShellDispatcherTest extends CakeTestCase {
|
|||
$Dispatcher->parseParams($params);
|
||||
$this->assertEqual($expected, $Dispatcher->params);
|
||||
|
||||
|
||||
$params = array('cake.php');
|
||||
$expected = array(
|
||||
'app' => 'app',
|
||||
|
|
@ -237,7 +236,6 @@ class ShellDispatcherTest extends CakeTestCase {
|
|||
$Dispatcher->parseParams($params);
|
||||
$this->assertEqual($expected, $Dispatcher->params);
|
||||
|
||||
|
||||
$params = array(
|
||||
'cake.php',
|
||||
'-app',
|
||||
|
|
@ -253,7 +251,6 @@ class ShellDispatcherTest extends CakeTestCase {
|
|||
$Dispatcher->parseParams($params);
|
||||
$this->assertEqual($expected, $Dispatcher->params);
|
||||
|
||||
|
||||
$params = array(
|
||||
'./cake.php',
|
||||
'bake',
|
||||
|
|
@ -274,7 +271,6 @@ class ShellDispatcherTest extends CakeTestCase {
|
|||
$Dispatcher->parseParams($params);
|
||||
$this->assertEqual($expected, $Dispatcher->params);
|
||||
|
||||
|
||||
$params = array(
|
||||
'./console/cake.php',
|
||||
'bake',
|
||||
|
|
@ -293,7 +289,6 @@ class ShellDispatcherTest extends CakeTestCase {
|
|||
$Dispatcher->parseParams($params);
|
||||
$this->assertEqual($expected, $Dispatcher->params);
|
||||
|
||||
|
||||
$params = array(
|
||||
'./console/cake.php',
|
||||
'bake',
|
||||
|
|
@ -314,7 +309,6 @@ class ShellDispatcherTest extends CakeTestCase {
|
|||
$Dispatcher->parseParams($params);
|
||||
$this->assertEqual($expected, $Dispatcher->params);
|
||||
|
||||
|
||||
$params = array(
|
||||
'./console/cake.php',
|
||||
'-working',
|
||||
|
|
@ -340,11 +334,9 @@ class ShellDispatcherTest extends CakeTestCase {
|
|||
$Dispatcher->parseParams($params);
|
||||
$this->assertEqual($expected, $Dispatcher->params);
|
||||
|
||||
|
||||
$expected = array('./console/cake.php', 'schema', 'run', 'create');
|
||||
$this->assertEqual($expected, $Dispatcher->args);
|
||||
|
||||
|
||||
$params = array(
|
||||
'/cake/1.2.x.x/cake/console/cake.php',
|
||||
'-working',
|
||||
|
|
@ -368,7 +360,6 @@ class ShellDispatcherTest extends CakeTestCase {
|
|||
$Dispatcher->parseParams($params);
|
||||
$this->assertEqual($expected, $Dispatcher->params);
|
||||
|
||||
|
||||
$expected = array('/cake/1.2.x.x/cake/console/cake.php', 'schema', 'run', 'create');
|
||||
$this->assertEqual($expected, $Dispatcher->args);
|
||||
$params = array(
|
||||
|
|
@ -386,12 +377,10 @@ class ShellDispatcherTest extends CakeTestCase {
|
|||
'root' => 'C:\wamp\www\apps\cake'
|
||||
);
|
||||
|
||||
|
||||
$Dispatcher->params = $Dispatcher->args = array();
|
||||
$Dispatcher->parseParams($params);
|
||||
$this->assertEqual($expected, $Dispatcher->params);
|
||||
|
||||
|
||||
$params = array(
|
||||
'cake.php',
|
||||
'-working',
|
||||
|
|
@ -410,7 +399,6 @@ class ShellDispatcherTest extends CakeTestCase {
|
|||
$Dispatcher->parseParams($params);
|
||||
$this->assertEqual($expected, $Dispatcher->params);
|
||||
|
||||
|
||||
$params = array(
|
||||
'cake.php',
|
||||
'-working',
|
||||
|
|
@ -432,7 +420,6 @@ class ShellDispatcherTest extends CakeTestCase {
|
|||
$Dispatcher->parseParams($params);
|
||||
$this->assertEqual($expected, $Dispatcher->params);
|
||||
|
||||
|
||||
$params = array(
|
||||
'/home/amelo/dev/cake-common/cake/console/cake.php',
|
||||
'-root',
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ if (!class_exists('ShellDispatcher')) {
|
|||
require_once CAKE . 'console' . DS . 'libs' . DS . 'tasks' . DS . 'db_config.php';
|
||||
//require_once CAKE . 'console' . DS . 'libs' . DS . 'tasks' . DS . 'template.php';
|
||||
|
||||
|
||||
Mock::generatePartial(
|
||||
'ShellDispatcher', 'TestDbConfigTaskMockShellDispatcher',
|
||||
array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
|
||||
|
|
@ -73,6 +72,7 @@ class TEST_DATABASE_CONFIG {
|
|||
* @subpackage cake.tests.cases.console.libs.tasks
|
||||
*/
|
||||
class DbConfigTaskTest extends CakeTestCase {
|
||||
|
||||
/**
|
||||
* startTest method
|
||||
*
|
||||
|
|
@ -88,6 +88,7 @@ class DbConfigTaskTest extends CakeTestCase {
|
|||
$this->Task->params['working'] = rtrim(APP, '/');
|
||||
$this->Task->databaseClassName = 'TEST_DATABASE_CONFIG';
|
||||
}
|
||||
|
||||
/**
|
||||
* endTest method
|
||||
*
|
||||
|
|
@ -98,6 +99,7 @@ class DbConfigTaskTest extends CakeTestCase {
|
|||
unset($this->Task, $this->Dispatcher);
|
||||
ClassRegistry::flush();
|
||||
}
|
||||
|
||||
/**
|
||||
* Test the getConfig method.
|
||||
*
|
||||
|
|
@ -108,6 +110,7 @@ class DbConfigTaskTest extends CakeTestCase {
|
|||
$result = $this->Task->getConfig();
|
||||
$this->assertEqual($result, 'otherOne');
|
||||
}
|
||||
|
||||
/**
|
||||
* test that initialize sets the path up.
|
||||
*
|
||||
|
|
@ -120,6 +123,7 @@ class DbConfigTaskTest extends CakeTestCase {
|
|||
$this->assertEqual($this->Task->path, APP . 'config' . DS);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* test execute and by extension __interactive
|
||||
*
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ Mock::generatePartial(
|
|||
'Shell', 'MockFixtureModelTask',
|
||||
array('in', 'out', 'err', 'createFile', '_stop', 'getName', 'getTable', 'listAll')
|
||||
);
|
||||
|
||||
/**
|
||||
* FixtureTaskTest class
|
||||
*
|
||||
|
|
@ -54,12 +55,14 @@ Mock::generatePartial(
|
|||
* @subpackage cake.tests.cases.console.libs.tasks
|
||||
*/
|
||||
class FixtureTaskTest extends CakeTestCase {
|
||||
|
||||
/**
|
||||
* fixtures
|
||||
*
|
||||
* @var array
|
||||
**/
|
||||
var $fixtures = array('core.article', 'core.comment');
|
||||
|
||||
/**
|
||||
* startTest method
|
||||
*
|
||||
|
|
@ -75,6 +78,7 @@ class FixtureTaskTest extends CakeTestCase {
|
|||
$this->Task->Dispatch->shellPaths = App::path('shells');
|
||||
$this->Task->Template->initialize();
|
||||
}
|
||||
|
||||
/**
|
||||
* endTest method
|
||||
*
|
||||
|
|
@ -85,6 +89,7 @@ class FixtureTaskTest extends CakeTestCase {
|
|||
unset($this->Task, $this->Dispatcher);
|
||||
ClassRegistry::flush();
|
||||
}
|
||||
|
||||
/**
|
||||
* test that initialize sets the path
|
||||
*
|
||||
|
|
@ -97,6 +102,7 @@ class FixtureTaskTest extends CakeTestCase {
|
|||
$expected = '/my/path/tests/fixtures/';
|
||||
$this->assertEqual($Task->path, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* test import option array generation
|
||||
*
|
||||
|
|
@ -125,6 +131,7 @@ class FixtureTaskTest extends CakeTestCase {
|
|||
$expected = array('fromTable' => true);
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* test generating a fixture with database conditions.
|
||||
*
|
||||
|
|
@ -143,6 +150,7 @@ class FixtureTaskTest extends CakeTestCase {
|
|||
$this->assertPattern('/Second Article/', $result, 'Missing import data %s');
|
||||
$this->assertPattern('/Third Article/', $result, 'Missing import data %s');
|
||||
}
|
||||
|
||||
/**
|
||||
* test that execute passes runs bake depending with named model.
|
||||
*
|
||||
|
|
@ -156,6 +164,7 @@ class FixtureTaskTest extends CakeTestCase {
|
|||
$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class ArticleFixture/')));
|
||||
$this->Task->execute();
|
||||
}
|
||||
|
||||
/**
|
||||
* test that execute runs all() when args[0] = all
|
||||
*
|
||||
|
|
@ -175,6 +184,7 @@ class FixtureTaskTest extends CakeTestCase {
|
|||
$this->Task->expectAt(1, 'createFile', array($filename, new PatternExpectation('/class CommentFixture/')));
|
||||
$this->Task->execute();
|
||||
}
|
||||
|
||||
/**
|
||||
* test interactive mode of execute
|
||||
*
|
||||
|
|
@ -192,6 +202,7 @@ class FixtureTaskTest extends CakeTestCase {
|
|||
$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class ArticleFixture/')));
|
||||
$this->Task->execute();
|
||||
}
|
||||
|
||||
/**
|
||||
* Test that bake works
|
||||
*
|
||||
|
|
@ -225,6 +236,7 @@ class FixtureTaskTest extends CakeTestCase {
|
|||
$this->assertNoPattern('/var \$fields/', $result);
|
||||
$this->assertNoPattern('/var \$records/', $result);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test that file generation includes headers and correct path for plugins.
|
||||
*
|
||||
|
|
@ -241,6 +253,7 @@ class FixtureTaskTest extends CakeTestCase {
|
|||
$this->Task->expectAt(1, 'createFile', array($filename, new PatternExpectation('/\<\?php(.*)\?\>/ms')));
|
||||
$result = $this->Task->generateFixtureFile('Article', array());
|
||||
}
|
||||
|
||||
/**
|
||||
* test generating files into plugins.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<?php
|
||||
/* SVN FILE: $Id$ */
|
||||
|
||||
/**
|
||||
* TestTaskTest file
|
||||
*
|
||||
|
|
@ -92,6 +93,7 @@ class TestTaskTag extends Model {
|
|||
)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Simulated Plugin
|
||||
**/
|
||||
|
|
@ -123,6 +125,7 @@ class TestTaskCommentsController extends Controller {
|
|||
class TestTaskTest extends CakeTestCase {
|
||||
|
||||
var $fixtures = array('core.article', 'core.comment', 'core.articles_tag', 'core.tag');
|
||||
|
||||
/**
|
||||
* startTest method
|
||||
*
|
||||
|
|
@ -136,6 +139,7 @@ class TestTaskTest extends CakeTestCase {
|
|||
$this->Task->Dispatch =& $this->Dispatcher;
|
||||
$this->Task->Template =& new TemplateTask($this->Dispatcher);
|
||||
}
|
||||
|
||||
/**
|
||||
* endTest method
|
||||
*
|
||||
|
|
@ -145,13 +149,14 @@ class TestTaskTest extends CakeTestCase {
|
|||
function endTest() {
|
||||
ClassRegistry::flush();
|
||||
}
|
||||
|
||||
/**
|
||||
* Test that file path generation doesn't continuously append paths.
|
||||
*
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
function testFilePathGeneration () {
|
||||
function testFilePathGeneration() {
|
||||
$file = TESTS . 'cases' . DS . 'models' . DS . 'my_class.test.php';
|
||||
|
||||
$this->Task->Dispatch->expectNever('stderr');
|
||||
|
|
@ -168,6 +173,7 @@ class TestTaskTest extends CakeTestCase {
|
|||
$this->Task->expectAt(2, 'createFile', array($file, '*'));
|
||||
$this->Task->bake('Controller', 'Comments');
|
||||
}
|
||||
|
||||
/**
|
||||
* Test that method introspection pulls all relevant non parent class
|
||||
* methods into the test case.
|
||||
|
|
@ -179,6 +185,7 @@ class TestTaskTest extends CakeTestCase {
|
|||
$expected = array('doSomething', 'doSomethingElse');
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* test that the generation of fixtures works correctly.
|
||||
*
|
||||
|
|
@ -192,6 +199,7 @@ class TestTaskTest extends CakeTestCase {
|
|||
|
||||
$this->assertEqual(sort($result), sort($expected));
|
||||
}
|
||||
|
||||
/**
|
||||
* test that the generation of fixtures works correctly.
|
||||
*
|
||||
|
|
@ -205,6 +213,7 @@ class TestTaskTest extends CakeTestCase {
|
|||
|
||||
$this->assertEqual(sort($result), sort($expected));
|
||||
}
|
||||
|
||||
/**
|
||||
* test user interaction to get object type
|
||||
*
|
||||
|
|
@ -219,6 +228,7 @@ class TestTaskTest extends CakeTestCase {
|
|||
$result = $this->Task->getObjectType();
|
||||
$this->assertEqual($result, $this->Task->classTypes[1]);
|
||||
}
|
||||
|
||||
/**
|
||||
* creating test subjects should clear the registry so the registry is always fresh
|
||||
*
|
||||
|
|
@ -242,6 +252,7 @@ class TestTaskTest extends CakeTestCase {
|
|||
$keys = ClassRegistry::keys();
|
||||
$this->assertFalse(in_array('random', $keys));
|
||||
}
|
||||
|
||||
/**
|
||||
* test that getClassName returns the user choice as a classname.
|
||||
*
|
||||
|
|
@ -262,6 +273,7 @@ class TestTaskTest extends CakeTestCase {
|
|||
$options = Configure::listObjects('model');
|
||||
$this->assertEqual($result, $options[0]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test the user interaction for defining additional fixtures.
|
||||
*
|
||||
|
|
@ -274,6 +286,7 @@ class TestTaskTest extends CakeTestCase {
|
|||
$expected = array('app.pizza', 'app.topping', 'app.side_dish');
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* test that resolving classnames works
|
||||
*
|
||||
|
|
@ -295,6 +308,7 @@ class TestTaskTest extends CakeTestCase {
|
|||
$result = $this->Task->getRealClassname('Component', 'Auth');
|
||||
$this->assertEqual($result, 'AuthComponent');
|
||||
}
|
||||
|
||||
/**
|
||||
* test baking files.
|
||||
*
|
||||
|
|
@ -323,6 +337,7 @@ class TestTaskTest extends CakeTestCase {
|
|||
$this->assertPattern("/'app\.test_task_tag'/", $result);
|
||||
$this->assertPattern("/'app\.articles_tag'/", $result);
|
||||
}
|
||||
|
||||
/**
|
||||
* test baking controller test files, ensure that the stub class is generated.
|
||||
*
|
||||
|
|
@ -352,6 +367,7 @@ class TestTaskTest extends CakeTestCase {
|
|||
$this->assertPattern("/'app\.test_task_tag'/", $result);
|
||||
$this->assertPattern("/'app\.articles_tag'/", $result);
|
||||
}
|
||||
|
||||
/**
|
||||
* test Constructor generation ensure that constructClasses is called for controllers
|
||||
*
|
||||
|
|
@ -370,6 +386,7 @@ class TestTaskTest extends CakeTestCase {
|
|||
$expected = "new FormHelper()\n";
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test that mock class generation works for the appropriate classes
|
||||
*
|
||||
|
|
@ -379,6 +396,7 @@ class TestTaskTest extends CakeTestCase {
|
|||
$result = $this->Task->hasMockClass('controller');
|
||||
$this->assertTrue($result);
|
||||
}
|
||||
|
||||
/**
|
||||
* test bake() with a -plugin param
|
||||
*
|
||||
|
|
@ -391,6 +409,7 @@ class TestTaskTest extends CakeTestCase {
|
|||
$this->Task->expectAt(0, 'createFile', array($path, '*'));
|
||||
$this->Task->bake('Helper', 'Form');
|
||||
}
|
||||
|
||||
/**
|
||||
* Test filename generation for each type + plugins
|
||||
*
|
||||
|
|
@ -424,6 +443,7 @@ class TestTaskTest extends CakeTestCase {
|
|||
$expected = APP . 'plugins' . DS . 'test_test' . DS . 'tests' . DS . 'cases' . DS . 'models' . DS . 'post.test.php';
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* test execute with a type defined
|
||||
*
|
||||
|
|
@ -436,6 +456,7 @@ class TestTaskTest extends CakeTestCase {
|
|||
$this->Task->expectAt(0, 'createFile', array('*', new PatternExpectation('/class TestTaskTagTestCase extends CakeTestCase/')));
|
||||
$this->Task->execute();
|
||||
}
|
||||
|
||||
/**
|
||||
* test execute with type and class name defined
|
||||
*
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
*/
|
||||
App::import('Controller', array('Component', 'Controller'), false);
|
||||
App::import('Component', 'Cookie');
|
||||
|
||||
/**
|
||||
* CookieComponentTestController class
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<?php
|
||||
/* SVN FILE: $Id: model.test.php 8225 2009-07-08 03:25:30Z mark_story $ */
|
||||
|
||||
/**
|
||||
* ModelDeleteTest file
|
||||
*
|
||||
|
|
@ -26,6 +27,7 @@
|
|||
*/
|
||||
require_once dirname(__FILE__) . DS . 'model.test.php';
|
||||
require_once dirname(__FILE__) . DS . 'model_delete.test.php';
|
||||
|
||||
/**
|
||||
* ModelDeleteTest
|
||||
*
|
||||
|
|
@ -33,6 +35,7 @@ require_once dirname(__FILE__) . DS . 'model_delete.test.php';
|
|||
* @subpackage cake.tests.cases.libs.model.operations
|
||||
*/
|
||||
class ModelDeleteTest extends BaseModelTest {
|
||||
|
||||
/**
|
||||
* testDeleteHabtmReferenceWithConditions method
|
||||
*
|
||||
|
|
@ -123,6 +126,7 @@ class ModelDeleteTest extends BaseModelTest {
|
|||
));
|
||||
$this->assertFalse($result);
|
||||
}
|
||||
|
||||
/**
|
||||
* testDeleteArticleBLinks method
|
||||
*
|
||||
|
|
@ -151,6 +155,7 @@ class ModelDeleteTest extends BaseModelTest {
|
|||
);
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testDeleteDependentWithConditions method
|
||||
*
|
||||
|
|
@ -179,6 +184,7 @@ class ModelDeleteTest extends BaseModelTest {
|
|||
$this->assertTrue(is_array($result));
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testDel method
|
||||
*
|
||||
|
|
@ -228,7 +234,6 @@ class ModelDeleteTest extends BaseModelTest {
|
|||
|
||||
$this->assertEqual($result, $expected);
|
||||
|
||||
|
||||
// make sure deleting a non-existent record doesn't break save()
|
||||
// ticket #6293
|
||||
$this->loadFixtures('Uuid');
|
||||
|
|
@ -258,6 +263,7 @@ class ModelDeleteTest extends BaseModelTest {
|
|||
'id' => 'B607DAB9-88A2-46CF-B57C-842CA9E3B3B3')));
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testDeleteAll method
|
||||
*
|
||||
|
|
@ -399,6 +405,7 @@ class ModelDeleteTest extends BaseModelTest {
|
|||
$result = $TestModel->deleteAll(array('Article.user_id' => 999));
|
||||
$this->assertTrue($result, 'deleteAll returned false when all no records matched conditions. %s');
|
||||
}
|
||||
|
||||
/**
|
||||
* testRecursiveDel method
|
||||
*
|
||||
|
|
@ -434,6 +441,7 @@ class ModelDeleteTest extends BaseModelTest {
|
|||
$result = $TestModel->Comment->Attachment->find('count');
|
||||
$this->assertEqual($result, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* testDependentExclusiveDelete method
|
||||
*
|
||||
|
|
@ -452,6 +460,7 @@ class ModelDeleteTest extends BaseModelTest {
|
|||
$TestModel->delete(1);
|
||||
$this->assertEqual($TestModel->Comment->find('count'), 2);
|
||||
}
|
||||
|
||||
/**
|
||||
* testDeleteLinks method
|
||||
*
|
||||
|
|
@ -499,6 +508,7 @@ class ModelDeleteTest extends BaseModelTest {
|
|||
$result = $TestModel->deleteAll(array('Article.user_id' => 999));
|
||||
$this->assertTrue($result, 'deleteAll returned false when all no records matched conditions. %s');
|
||||
}
|
||||
|
||||
/**
|
||||
* testHabtmDeleteLinksWhenNoPrimaryKeyInJoinTable method
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<?php
|
||||
/* SVN FILE: $Id: model.test.php 8225 2009-07-08 03:25:30Z mark_story $ */
|
||||
|
||||
/**
|
||||
* ModelDeleteTest file
|
||||
*
|
||||
|
|
@ -34,6 +35,7 @@ require_once dirname(__FILE__) . DS . 'model_integration.test.php';
|
|||
* @subpackage cake.tests.cases.libs.model.operations
|
||||
*/
|
||||
class ModelIntegrationTest extends BaseModelTest {
|
||||
|
||||
/**
|
||||
* testPkInHAbtmLinkModelArticleB
|
||||
*
|
||||
|
|
@ -45,6 +47,7 @@ class ModelIntegrationTest extends BaseModelTest {
|
|||
$TestModel2 =& new ArticleB();
|
||||
$this->assertEqual($TestModel2->ArticlesTag->primaryKey, 'article_id');
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests that $cacheSources can only be disabled in the db using model settings, not enabled
|
||||
*
|
||||
|
|
@ -64,6 +67,7 @@ class ModelIntegrationTest extends BaseModelTest {
|
|||
$TestModel->setSource('join_as');
|
||||
$this->assertFalse($this->db->cacheSources);
|
||||
}
|
||||
|
||||
/**
|
||||
* testPkInHabtmLinkModel method
|
||||
*
|
||||
|
|
@ -92,6 +96,7 @@ class ModelIntegrationTest extends BaseModelTest {
|
|||
$this->assertEqual($TestModel4->JoinAsJoinB->primaryKey, 'id');
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* testDynamicBehaviorAttachment method
|
||||
*
|
||||
|
|
@ -128,6 +133,7 @@ class ModelIntegrationTest extends BaseModelTest {
|
|||
$this->assertEqual($TestModel->Behaviors->attached(), array());
|
||||
$this->assertFalse(isset($TestModel->Behaviors->Tree));
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests cross database joins. Requires $test and $test2 to both be set in DATABASE_CONFIG
|
||||
* NOTE: When testing on MySQL, you must set 'persistent' => false on *both* database connections,
|
||||
|
|
@ -490,6 +496,7 @@ class ModelIntegrationTest extends BaseModelTest {
|
|||
$this->_fixtures[$this->_fixtureClassMap[$class]]->drop($db2);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* testDisplayField method
|
||||
*
|
||||
|
|
@ -506,6 +513,7 @@ class ModelIntegrationTest extends BaseModelTest {
|
|||
$this->assertEqual($Person->displayField, 'name');
|
||||
$this->assertEqual($Comment->displayField, 'id');
|
||||
}
|
||||
|
||||
/**
|
||||
* testSchema method
|
||||
*
|
||||
|
|
@ -528,6 +536,7 @@ class ModelIntegrationTest extends BaseModelTest {
|
|||
|
||||
$this->assertEqual($Post->getColumnTypes(), array_combine($columns, $types));
|
||||
}
|
||||
|
||||
/**
|
||||
* test deconstruct() with time fields.
|
||||
*
|
||||
|
|
@ -613,6 +622,7 @@ class ModelIntegrationTest extends BaseModelTest {
|
|||
$TestModel->set($data);
|
||||
$this->assertEqual($TestModel->data, $data);
|
||||
}
|
||||
|
||||
/**
|
||||
* testDeconstructFields with datetime, timestamp, and date fields
|
||||
*
|
||||
|
|
@ -789,6 +799,7 @@ class ModelIntegrationTest extends BaseModelTest {
|
|||
$TestModel->set($data);
|
||||
$this->assertEqual($TestModel->data, $data);
|
||||
}
|
||||
|
||||
/**
|
||||
* testTablePrefixSwitching method
|
||||
*
|
||||
|
|
@ -842,6 +853,7 @@ class ModelIntegrationTest extends BaseModelTest {
|
|||
$this->assertEqual($db2->fullTableName($TestModel, false), 'apples');
|
||||
$this->assertEqual($db1->fullTableName($TestModel, false), 'apples');
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests validation parameter order in custom validation methods
|
||||
*
|
||||
|
|
@ -852,6 +864,7 @@ class ModelIntegrationTest extends BaseModelTest {
|
|||
$TestModel =& new ValidationTest1();
|
||||
$this->assertNull($TestModel->getAssociated('Foo'));
|
||||
}
|
||||
|
||||
/**
|
||||
* testLoadModelSecondIteration method
|
||||
*
|
||||
|
|
@ -868,6 +881,7 @@ class ModelIntegrationTest extends BaseModelTest {
|
|||
$this->assertIsA($model->ModelC, 'ModelC');
|
||||
$this->assertIsA($model->ModelC->ModelD, 'ModelD');
|
||||
}
|
||||
|
||||
/**
|
||||
* ensure that __exists is reset on create
|
||||
*
|
||||
|
|
@ -889,6 +903,7 @@ class ModelIntegrationTest extends BaseModelTest {
|
|||
$result = $Article->read(null, 2);
|
||||
$this->assertEqual($result['Article']['title'], 'Staying alive');
|
||||
}
|
||||
|
||||
/**
|
||||
* testPluginAssociations method
|
||||
*
|
||||
|
|
@ -1013,6 +1028,7 @@ class ModelIntegrationTest extends BaseModelTest {
|
|||
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests getAssociated method
|
||||
*
|
||||
|
|
@ -1161,6 +1177,7 @@ class ModelIntegrationTest extends BaseModelTest {
|
|||
$this->assertEqual($TestModel->Tag->name, 'Tag');
|
||||
$this->assertEqual($TestFakeModel->Tag->name, 'Tag');
|
||||
}
|
||||
|
||||
/**
|
||||
* test Model::__construct
|
||||
*
|
||||
|
|
@ -1181,6 +1198,7 @@ class ModelIntegrationTest extends BaseModelTest {
|
|||
$this->assertEqual($TestModel->actsAs, $expected);
|
||||
$this->assertTrue(isset($TestModel->Behaviors->Containable));
|
||||
}
|
||||
|
||||
/**
|
||||
* test Model::__construct
|
||||
*
|
||||
|
|
@ -1198,6 +1216,7 @@ class ModelIntegrationTest extends BaseModelTest {
|
|||
$NewVoid =& new TheVoid(null, false, 'other');
|
||||
$this->assertEqual('other', $NewVoid->useDbConfig);
|
||||
}
|
||||
|
||||
/**
|
||||
* testColumnTypeFetching method
|
||||
*
|
||||
|
|
@ -1216,6 +1235,7 @@ class ModelIntegrationTest extends BaseModelTest {
|
|||
$this->assertEqual($model->getColumnType('Tag.id'), 'integer');
|
||||
$this->assertEqual($model->getColumnType('Article.id'), 'integer');
|
||||
}
|
||||
|
||||
/**
|
||||
* testHabtmUniqueKey method
|
||||
*
|
||||
|
|
@ -1226,6 +1246,7 @@ class ModelIntegrationTest extends BaseModelTest {
|
|||
$model =& new Item();
|
||||
$this->assertFalse($model->hasAndBelongsToMany['Portfolio']['unique']);
|
||||
}
|
||||
|
||||
/**
|
||||
* testIdentity method
|
||||
*
|
||||
|
|
@ -1248,6 +1269,7 @@ class ModelIntegrationTest extends BaseModelTest {
|
|||
$expected = 'AnotherTest';
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testWithAssociation method
|
||||
*
|
||||
|
|
@ -1499,6 +1521,7 @@ class ModelIntegrationTest extends BaseModelTest {
|
|||
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testFindSelfAssociations method
|
||||
*
|
||||
|
|
@ -1608,6 +1631,7 @@ class ModelIntegrationTest extends BaseModelTest {
|
|||
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testDynamicAssociations method
|
||||
*
|
||||
|
|
@ -1715,6 +1739,7 @@ class ModelIntegrationTest extends BaseModelTest {
|
|||
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testCreation method
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<?php
|
||||
/* SVN FILE: $Id: model.test.php 8225 2009-07-08 03:25:30Z mark_story $ */
|
||||
|
||||
/**
|
||||
* ModelReadTest file
|
||||
*
|
||||
|
|
@ -26,6 +27,7 @@
|
|||
*/
|
||||
require_once dirname(__FILE__) . DS . 'model.test.php';
|
||||
require_once dirname(__FILE__) . DS . 'model_read.test.php';
|
||||
|
||||
/**
|
||||
* ModelReadTest
|
||||
*
|
||||
|
|
@ -33,6 +35,7 @@ require_once dirname(__FILE__) . DS . 'model_read.test.php';
|
|||
* @subpackage cake.tests.cases.libs.model.operations
|
||||
*/
|
||||
class ModelReadTest extends BaseModelTest {
|
||||
|
||||
/**
|
||||
* testFetchingNonUniqueFKJoinTableRecords()
|
||||
*
|
||||
|
|
@ -70,6 +73,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
$this->assertEqual($result['SomethingElse'][0]['JoinThing']['doomed'], 1);
|
||||
$this->assertEqual($result['SomethingElse'][1]['JoinThing']['doomed'], 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* testGroupBy method
|
||||
*
|
||||
|
|
@ -196,28 +200,24 @@ class ModelReadTest extends BaseModelTest {
|
|||
));
|
||||
$this->assertEqual($result, $expected);
|
||||
|
||||
|
||||
$result = $Thread->find('all', array(
|
||||
'conditions' => array('Thread.project_id' => 1),
|
||||
'group' => array('project_id')
|
||||
));
|
||||
$this->assertEqual($result, $expected);
|
||||
|
||||
|
||||
$result = $Thread->find('all', array(
|
||||
'conditions' => array('Thread.project_id' => 1),
|
||||
'group' => array('project_id', 'Project.id')
|
||||
));
|
||||
$this->assertEqual($result, $expected);
|
||||
|
||||
|
||||
$result = $Thread->find('all', array(
|
||||
'conditions' => array('Thread.project_id' => 1),
|
||||
'group' => array('Thread.project_id', 'Project.id')
|
||||
));
|
||||
$this->assertEqual($result, $expected);
|
||||
|
||||
|
||||
$expected = array(
|
||||
array('Product' => array('type' => 'Clothing'), array('price' => 32)),
|
||||
array('Product' => array('type' => 'Food'), array('price' => 9)),
|
||||
|
|
@ -237,6 +237,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
'order' => 'Product.type ASC'));
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testOldQuery method
|
||||
*
|
||||
|
|
@ -272,6 +273,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
$this->assertTrue(isset($this->db->_queryCache[$query]));
|
||||
$this->assertTrue(is_array($results));
|
||||
}
|
||||
|
||||
/**
|
||||
* testPreparedQuery method
|
||||
*
|
||||
|
|
@ -353,6 +355,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
$this->assertTrue(isset($this->db->_queryCache[$expected]));
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* testParameterMismatch method
|
||||
*
|
||||
|
|
@ -374,6 +377,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
ob_end_clean();
|
||||
$this->assertEqual($result, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* testVeryStrangeUseCase method
|
||||
*
|
||||
|
|
@ -403,6 +407,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
$result = $Article->query($query, $param);
|
||||
ob_end_clean();
|
||||
}
|
||||
|
||||
/**
|
||||
* testRecursiveUnbind method
|
||||
*
|
||||
|
|
@ -2997,6 +3002,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
)));
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testSelfAssociationAfterFind method
|
||||
*
|
||||
|
|
@ -3024,6 +3030,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
}
|
||||
$this->assertEqual($afterFindData, $noAfterFindData);
|
||||
}
|
||||
|
||||
/**
|
||||
* testFindAllThreaded method
|
||||
*
|
||||
|
|
@ -3500,6 +3507,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
);
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* test find('neighbors')
|
||||
*
|
||||
|
|
@ -3933,6 +3941,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
));
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testSaveEmpty method
|
||||
*
|
||||
|
|
@ -4045,7 +4054,6 @@ class ModelReadTest extends BaseModelTest {
|
|||
$result = $TestModel->find('all', compact('conditions', 'recursive', 'order'));
|
||||
$this->assertEqual($result, $expected);
|
||||
|
||||
|
||||
$conditions = array('id' => array('1', 2, '3.0'));
|
||||
$order = 'Article.id ASC';
|
||||
$result = $TestModel->find('all', compact('recursive', 'conditions', 'order'));
|
||||
|
|
@ -4086,6 +4094,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
);
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testBindUnbind method
|
||||
*
|
||||
|
|
@ -4545,6 +4554,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
$this->assertEqual($TestModel2->hasMany['NewFeatureSet'], $expected);
|
||||
$this->assertTrue(is_object($TestModel2->NewFeatureSet));
|
||||
}
|
||||
|
||||
/**
|
||||
* testBindMultipleTimes method
|
||||
*
|
||||
|
|
@ -4825,6 +4835,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
);
|
||||
$this->assertEqual($result[0]['Post'][0]['Comment'][0], $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests that callbacks can be properly disabled
|
||||
*
|
||||
|
|
@ -4851,6 +4862,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
$expected = array('mariano', 'nate', 'larry', 'garrett');
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testMultipleBelongsToWithSameClass method
|
||||
*
|
||||
|
|
@ -4949,6 +4961,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testHabtmRecursiveBelongsTo method
|
||||
*
|
||||
|
|
@ -5007,6 +5020,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testHabtmFinderQuery method
|
||||
*
|
||||
|
|
@ -5055,6 +5069,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
|
||||
$this->assertEqual($result['Tag'], $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testHabtmLimitOptimization method
|
||||
*
|
||||
|
|
@ -5125,6 +5140,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testHasManyLimitOptimization method
|
||||
*
|
||||
|
|
@ -5239,6 +5255,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testFindAllRecursiveSelfJoin method
|
||||
*
|
||||
|
|
@ -5344,10 +5361,8 @@ class ModelReadTest extends BaseModelTest {
|
|||
)))));
|
||||
|
||||
$this->assertEqual($result, $expected);
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* testFindAllRecursiveWithHabtm method
|
||||
*
|
||||
|
|
@ -5416,6 +5431,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
|
||||
$this->assertIdentical($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testReadFakeThread method
|
||||
*
|
||||
|
|
@ -5480,6 +5496,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
$this->db->fullDebug = $fullDebug;
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testFindFakeThread method
|
||||
*
|
||||
|
|
@ -5544,6 +5561,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
$this->db->fullDebug = $fullDebug;
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testFindAllFakeThread method
|
||||
*
|
||||
|
|
@ -5764,6 +5782,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
$this->db->fullDebug = $fullDebug;
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testConditionalNumerics method
|
||||
*
|
||||
|
|
@ -6011,6 +6030,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* test find('list') method
|
||||
*
|
||||
|
|
@ -6274,6 +6294,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
);
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testFindField method
|
||||
*
|
||||
|
|
@ -6303,6 +6324,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
$result = $TestModel->field('COUNT(*)', true);
|
||||
$this->assertEqual($result, 4);
|
||||
}
|
||||
|
||||
/**
|
||||
* testFindUnique method
|
||||
*
|
||||
|
|
@ -6325,6 +6347,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
'password' => '5f4dcc3b5aa765d61d8327deb882cf99'
|
||||
)));
|
||||
}
|
||||
|
||||
/**
|
||||
* test find('count') method
|
||||
*
|
||||
|
|
@ -6371,6 +6394,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
$result = $TestModel->find('count', array('fields' => 'DISTINCT name'));
|
||||
$this->assertEqual($result, 4);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test find(count) with Db::expression
|
||||
*
|
||||
|
|
@ -6395,6 +6419,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
)));
|
||||
$this->assertEqual($result, 1);
|
||||
}
|
||||
|
||||
/**
|
||||
* testFindMagic method
|
||||
*
|
||||
|
|
@ -6426,6 +6451,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
));
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testRead method
|
||||
*
|
||||
|
|
@ -6506,6 +6532,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
)));
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testRecursiveRead method
|
||||
*
|
||||
|
|
@ -6932,6 +6959,7 @@ class ModelReadTest extends BaseModelTest {
|
|||
)));
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testRecursiveFindAllWithLimit method
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<?php
|
||||
/* SVN FILE: $Id: model.test.php 8225 2009-07-08 03:25:30Z mark_story $ */
|
||||
|
||||
/**
|
||||
* ModelValidationTest file
|
||||
*
|
||||
|
|
@ -26,6 +27,7 @@
|
|||
*/
|
||||
require_once dirname(__FILE__) . DS . 'model.test.php';
|
||||
require_once dirname(__FILE__) . DS . 'model_validation.test.php';
|
||||
|
||||
/**
|
||||
* ModelValidationTest
|
||||
*
|
||||
|
|
@ -33,6 +35,7 @@ require_once dirname(__FILE__) . DS . 'model_validation.test.php';
|
|||
* @subpackage cake.tests.cases.libs.model.operations
|
||||
*/
|
||||
class ModelValidationTest extends BaseModelTest {
|
||||
|
||||
/**
|
||||
* Tests validation parameter order in custom validation methods
|
||||
*
|
||||
|
|
@ -74,6 +77,7 @@ class ModelValidationTest extends BaseModelTest {
|
|||
|
||||
$this->assertEqual($TestModel->invalidFields(), $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests validation parameter fieldList in invalidFields
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<?php
|
||||
/* SVN FILE: $Id: model.test.php 8225 2009-07-08 03:25:30Z mark_story $ */
|
||||
|
||||
/**
|
||||
* ModelWriteTest file
|
||||
*
|
||||
|
|
@ -26,6 +27,7 @@
|
|||
*/
|
||||
require_once dirname(__FILE__) . DS . 'model.test.php';
|
||||
require_once dirname(__FILE__) . DS . 'model_write.test.php';
|
||||
|
||||
/**
|
||||
* ModelWriteTest
|
||||
*
|
||||
|
|
@ -33,6 +35,7 @@ require_once dirname(__FILE__) . DS . 'model_write.test.php';
|
|||
* @subpackage cake.tests.cases.libs.model.operations
|
||||
*/
|
||||
class ModelWriteTest extends BaseModelTest {
|
||||
|
||||
/**
|
||||
* testInsertAnotherHabtmRecordWithSameForeignKey method
|
||||
*
|
||||
|
|
@ -87,6 +90,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$result = $TestModel->JoinAsJoinB->findById(1);
|
||||
$this->assertEqual($result['JoinAsJoinB']['other'], $updatedValue);
|
||||
}
|
||||
|
||||
/**
|
||||
* testSaveDateAsFirstEntry method
|
||||
*
|
||||
|
|
@ -117,6 +121,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$this->assertEqual($testResult['Article']['created'], '2008-01-01 00:00:00');
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* testUnderscoreFieldSave method
|
||||
*
|
||||
|
|
@ -142,6 +147,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$currentCount = $UnderscoreField->find('count');
|
||||
$this->assertEqual($currentCount, 4);
|
||||
}
|
||||
|
||||
/**
|
||||
* testAutoSaveUuid method
|
||||
*
|
||||
|
|
@ -163,6 +169,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
);
|
||||
$this->assertEqual(strlen($result['Uuid']['id']), 36);
|
||||
}
|
||||
|
||||
/**
|
||||
* testZeroDefaultFieldValue method
|
||||
*
|
||||
|
|
@ -183,6 +190,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$this->assertIdentical($result['DataTest']['count'], '0');
|
||||
$this->assertIdentical($result['DataTest']['float'], '0');
|
||||
}
|
||||
|
||||
/**
|
||||
* testNonNumericHabtmJoinKey method
|
||||
*
|
||||
|
|
@ -281,6 +289,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
));
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests validation parameter order in custom validation methods
|
||||
*
|
||||
|
|
@ -301,6 +310,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
));
|
||||
$this->assertEqual($TestModel->data, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* test that Caches are getting cleared on save().
|
||||
* ensure that both inflections of controller names are getting cleared
|
||||
|
|
@ -338,6 +348,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
Configure::write('Cache.check', $_back['check']);
|
||||
Configure::write('Cache.disable', $_back['disable']);
|
||||
}
|
||||
|
||||
/**
|
||||
* testSaveWithCounterCache method
|
||||
*
|
||||
|
|
@ -374,6 +385,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$result = $TestModel->findById(2);
|
||||
$this->assertIdentical($result['Syfile']['item_count'], '0');
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests that counter caches are updated when records are added
|
||||
*
|
||||
|
|
@ -399,6 +411,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$expected = 3;
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests that counter caches are updated when records are deleted
|
||||
*
|
||||
|
|
@ -420,6 +433,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$expected = 1;
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests that counter caches are updated when foreign keys of counted records change
|
||||
*
|
||||
|
|
@ -442,6 +456,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$this->assertEqual($users[0]['User']['post_count'], 1);
|
||||
$this->assertEqual($users[1]['User']['post_count'], 2);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test counter cache with models that use a non-standard (i.e. not using 'id')
|
||||
* as their primary key.
|
||||
|
|
@ -449,14 +464,14 @@ class ModelWriteTest extends BaseModelTest {
|
|||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
function testCounterCacheWithNonstandardPrimaryKey() {
|
||||
$this->loadFixtures(
|
||||
function testCounterCacheWithNonstandardPrimaryKey() {
|
||||
$this->loadFixtures(
|
||||
'CounterCacheUserNonstandardPrimaryKey',
|
||||
'CounterCachePostNonstandardPrimaryKey'
|
||||
);
|
||||
|
||||
$User = new CounterCacheUserNonstandardPrimaryKey();
|
||||
$Post = new CounterCachePostNonstandardPrimaryKey();
|
||||
$User = new CounterCacheUserNonstandardPrimaryKey();
|
||||
$Post = new CounterCachePostNonstandardPrimaryKey();
|
||||
|
||||
$data = $Post->find('first', array(
|
||||
'conditions' => array('pid' => 1),
|
||||
|
|
@ -468,7 +483,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$users = $User->find('all',array('order' => 'User.uid'));
|
||||
$this->assertEqual($users[0]['User']['post_count'], 1);
|
||||
$this->assertEqual($users[1]['User']['post_count'], 2);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* test Counter Cache With Self Joining table
|
||||
|
|
@ -498,6 +513,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$expected = array_fill(0, 1, 1);
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testSaveWithCounterCacheScope method
|
||||
*
|
||||
|
|
@ -537,6 +553,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$result = $TestModel->findById(1);
|
||||
$this->assertIdentical($result['Syfile']['item_count'], '1');
|
||||
}
|
||||
|
||||
/**
|
||||
* testValidatesBackwards method
|
||||
*
|
||||
|
|
@ -602,6 +619,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$result = $TestModel->validates();
|
||||
$this->assertTrue($result);
|
||||
}
|
||||
|
||||
/**
|
||||
* testValidates method
|
||||
*
|
||||
|
|
@ -954,6 +972,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
);
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testSaveField method
|
||||
*
|
||||
|
|
@ -1022,6 +1041,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$result = $Node->read();
|
||||
$this->assertEqual(Set::extract('/ParentNode/name', $result), array('Second'));
|
||||
}
|
||||
|
||||
/**
|
||||
* testSaveWithCreate method
|
||||
*
|
||||
|
|
@ -1243,6 +1263,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testSaveWithSet method
|
||||
*
|
||||
|
|
@ -1370,6 +1391,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
);
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testSaveWithNonExistentFields method
|
||||
*
|
||||
|
|
@ -1421,6 +1443,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 5);
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testSaveFromXml method
|
||||
*
|
||||
|
|
@ -1438,6 +1461,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$results = $Article->find(array('Article.title' => 'test xml'));
|
||||
$this->assertTrue($results);
|
||||
}
|
||||
|
||||
/**
|
||||
* testSaveHabtm method
|
||||
*
|
||||
|
|
@ -1909,6 +1933,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$expected = array('new record', 'new record');
|
||||
$this->assertEqual(Set::extract('/JoinC/JoinAsJoinC/other', $result), $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testSaveHabtmCustomKeys method
|
||||
*
|
||||
|
|
@ -1959,6 +1984,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
));
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testHabtmSaveKeyResolution method
|
||||
*
|
||||
|
|
@ -2048,6 +2074,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
));
|
||||
$this->assertEqual($result['Monkey'], $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testCreationOfEmptyRecord method
|
||||
*
|
||||
|
|
@ -2067,6 +2094,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$this->assertTrue(isset($result['Author']['updated']));
|
||||
$this->assertEqual($TestModel->find('count'), 1);
|
||||
}
|
||||
|
||||
/**
|
||||
* testCreateWithPKFiltering method
|
||||
*
|
||||
|
|
@ -2163,6 +2191,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$this->assertEqual($result, $expected);
|
||||
$this->assertFalse($TestModel->id);
|
||||
}
|
||||
|
||||
/**
|
||||
* testCreationWithMultipleData method
|
||||
*
|
||||
|
|
@ -2334,6 +2363,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
))));
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* testCreationWithMultipleDataSameModel method
|
||||
*
|
||||
|
|
@ -2392,6 +2422,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
'title' => 'Brand New Article'
|
||||
))));
|
||||
}
|
||||
|
||||
/**
|
||||
* testCreationWithMultipleDataSameModelManualInstances method
|
||||
*
|
||||
|
|
@ -2430,6 +2461,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$result = $Primary->find('count');
|
||||
$this->assertEqual($result, 2);
|
||||
}
|
||||
|
||||
/**
|
||||
* testRecordExists method
|
||||
*
|
||||
|
|
@ -2453,6 +2485,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$TestModel->id = 5;
|
||||
$this->assertFalse($TestModel->exists());
|
||||
}
|
||||
|
||||
/**
|
||||
* testUpdateExisting method
|
||||
*
|
||||
|
|
@ -2500,6 +2533,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$result = $Comment->save($data);
|
||||
$this->assertTrue($result);
|
||||
}
|
||||
|
||||
/**
|
||||
* testUpdateMultiple method
|
||||
*
|
||||
|
|
@ -2533,6 +2567,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$expected = array_fill(0, 2, 'Updated today');
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testHabtmUuidWithUuidId method
|
||||
*
|
||||
|
|
@ -2552,6 +2587,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$this->assertEqual(1, count($result['Uuiditem']));
|
||||
$this->assertEqual(strlen($result['Uuiditem'][0]['UuiditemsUuidportfolio']['id']), 36);
|
||||
}
|
||||
|
||||
/**
|
||||
* test HABTM saving when join table has no primary key and only 2 columns.
|
||||
*
|
||||
|
|
@ -2575,6 +2611,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
);
|
||||
$this->assertTrue($Fruit->save($data));
|
||||
}
|
||||
|
||||
/**
|
||||
* test HABTM saving when join table has no primary key and only 2 columns, no with model is used.
|
||||
*
|
||||
|
|
@ -2617,6 +2654,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$result = $TestModel->read(null, $id);
|
||||
$this->assertEqual(1, count($result['Uuidportfolio']));
|
||||
}
|
||||
|
||||
/**
|
||||
* testSaveMultipleHabtm method
|
||||
*
|
||||
|
|
@ -2735,6 +2773,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testSaveAll method
|
||||
*
|
||||
|
|
@ -2874,6 +2913,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
);
|
||||
$this->assertEqual($result[6]['Attachment'], $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test SaveAll with Habtm relations
|
||||
*
|
||||
|
|
@ -2905,6 +2945,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$this->assertEqual(count($result['Comment']), 1);
|
||||
$this->assertEqual(count($result['Comment'][0]['comment']['Article comment']), 1);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test SaveAll with Habtm relations and extra join table fields
|
||||
*
|
||||
|
|
@ -2948,6 +2989,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$this->assertTrue(Set::matches('/SomethingElse[id=3]/JoinThing[something_else_id=3]', $result));
|
||||
$this->assertTrue(Set::matches('/SomethingElse[id=3]/JoinThing[doomed=1]', $result));
|
||||
}
|
||||
|
||||
/**
|
||||
* testSaveAllHasOne method
|
||||
*
|
||||
|
|
@ -2987,6 +3029,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
)));
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testSaveAllBelongsTo method
|
||||
*
|
||||
|
|
@ -3026,6 +3069,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
)));
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testSaveAllHasOneValidation method
|
||||
*
|
||||
|
|
@ -3072,6 +3116,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$this->assertEqual($model->validationErrors, $expected['Comment']);
|
||||
$this->assertEqual($model->Attachment->validationErrors, $expected['Attachment']);
|
||||
}
|
||||
|
||||
/**
|
||||
* testSaveAllAtomic method
|
||||
*
|
||||
|
|
@ -3145,6 +3190,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
), array('atomic' => false));
|
||||
$this->assertIdentical($result, array('Article' => true, 'Comment' => array(true, true)));
|
||||
}
|
||||
|
||||
/**
|
||||
* testSaveAllHasMany method
|
||||
*
|
||||
|
|
@ -3221,6 +3267,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
);
|
||||
$this->assertEqual(Set::extract($result['Comment'], '{n}.comment'), $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testSaveAllHasManyValidation method
|
||||
*
|
||||
|
|
@ -3261,6 +3308,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
))
|
||||
), array('validate' => 'only'));
|
||||
}
|
||||
|
||||
/**
|
||||
* testSaveAllTransaction method
|
||||
*
|
||||
|
|
@ -3650,6 +3698,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
|
||||
$TestModel->validate['body'] = 'notEmpty';
|
||||
}
|
||||
|
||||
/**
|
||||
* testSaveAllValidationOnly method
|
||||
*
|
||||
|
|
@ -3702,6 +3751,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
);
|
||||
$this->assertEqual($TestModel->validationErrors, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
* testSaveAllValidateFirst method
|
||||
*
|
||||
|
|
@ -3780,6 +3830,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
);
|
||||
$this->assertEqual($result[0]['Comment'][0]['comment'], 'Only new comment');
|
||||
}
|
||||
|
||||
/**
|
||||
* testUpdateWithCalculation method
|
||||
*
|
||||
|
|
@ -3808,6 +3859,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$result = Set::extract('/DataTest/count', $model->find('all', array('fields' => 'count')));
|
||||
$this->assertEqual($result, array(6, 4, 5, 2));
|
||||
}
|
||||
|
||||
/**
|
||||
* testSaveAllHasManyValidationOnly method
|
||||
*
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ class CakeTestFixture extends Object {
|
|||
* @var string
|
||||
**/
|
||||
var $name = null;
|
||||
|
||||
/**
|
||||
* Cake's DBO driver (e.g: DboMysql).
|
||||
*
|
||||
|
|
@ -53,6 +54,7 @@ class CakeTestFixture extends Object {
|
|||
* @access public
|
||||
*/
|
||||
var $table = null;
|
||||
|
||||
/**
|
||||
* Instantiate the fixture.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -36,4 +36,3 @@
|
|||
<?php echo $variable; ?>
|
||||
</cake:nocache>
|
||||
<p>Additional regular text.</p>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue