mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 03:18:26 +00:00
adding test case
This commit is contained in:
parent
9a9ac6f3a7
commit
5064601c6f
2 changed files with 29 additions and 1 deletions
|
@ -2650,6 +2650,29 @@ class FormHelperTest extends CakeTestCase {
|
|||
'/div'
|
||||
);
|
||||
$this->assertTags($result, $expected);
|
||||
|
||||
$this->View->viewVars['balances'] = array(0 => 'nothing', 1 => 'some', 100 => 'a lot');
|
||||
$this->Form->request->data = array('ValidateUser' => array('balance' => 1));
|
||||
$result = $this->Form->input('ValidateUser.balance');
|
||||
$expected = array(
|
||||
'div' => array('class' => 'input select'),
|
||||
'label' => array('for' => 'ValidateUserBalance'),
|
||||
'Balance',
|
||||
'/label',
|
||||
'select' => array('name' => 'data[ValidateUser][balance]', 'id' => 'ValidateUserBalance'),
|
||||
array('option' => array('value' => '0')),
|
||||
'nothing',
|
||||
'/option',
|
||||
array('option' => array('value' => '1', 'selected' => 'selected')),
|
||||
'some',
|
||||
'/option',
|
||||
array('option' => array('value' => '100')),
|
||||
'a lot',
|
||||
'/option',
|
||||
'/select',
|
||||
'/div'
|
||||
);
|
||||
$this->assertTags($result, $expected);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -1006,12 +1006,17 @@ class FormHelper extends AppHelper {
|
|||
}
|
||||
$options['options'] = $varOptions;
|
||||
}
|
||||
|
||||
if ($options['type'] === 'select' && array_key_exists('step', $options)) {
|
||||
unset($options['step']);
|
||||
}
|
||||
}
|
||||
|
||||
$autoLength = (
|
||||
!array_key_exists('maxlength', $options) &&
|
||||
isset($fieldDef['length']) &&
|
||||
is_scalar($fieldDef['length'])
|
||||
is_scalar($fieldDef['length']) &&
|
||||
$options['type'] !== 'select'
|
||||
);
|
||||
if ($autoLength && $options['type'] == 'text') {
|
||||
$options['maxlength'] = $fieldDef['length'];
|
||||
|
|
Loading…
Reference in a new issue