mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 19:11:47 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into develop

Browse Source 
* github-nickvergessen/ticket/11201: (50 commits)
  [ticket/11201] Remove empty calls section from .yml
  [ticket/11201] Split template file into multiple files
  [ticket/11201] Remove dependency from types on the manager
  [ticket/11201] Rename profilefields class to manager
  [ticket/11201] Fix parameter description
  [ticket/11201] Use !== null, its faster
  [ticket/11201] Also translate profile fields in UCP and ACP
  [ticket/11201] Add parameters and variables to profile field class
  [ticket/11201] Add commas on last array entry
  [ticket/11201] Allow translation of profile field name and explanation
  [ticket/11201] Fix some variable names
  [ticket/11201] Add tables to constructor in tests
  [ticket/11201] Add a method to return the translated full name of the type
  [ticket/11201] Remove db depending code from field class
  [ticket/11201] Add variables to classes and add constructor doc blocks
  [ticket/11201] Update copyright in class file
  [ticket/11201] Add visibility and remove unused variable
  [ticket/11201] Add some commas at the last array entry
  [ticket/11201] Cast some variables to integer
  [ticket/11201] Inject table names rather then using constants
  ...

Conflicts:
	phpBB/config/services.yml
This commit is contained in:
Nils Adermann
2014-02-02 16:34:55 +01:00
parent 8a6b961c54 a59d6e94a5
commit 38af79dd30
42 changed files with 3021 additions and 1811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
tests/profile/custom_test.php
View File

@@ -7,49 +7,75 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_profile_fields.php';
class phpbb_profile_custom_test extends phpbb_database_test_case
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/profile_fields.xml');
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/profile_fields.xml');
}
static public function dropdownFields()
static public function dropdown_fields()
{
return array(
// note, there is an offset of 1 between option_id (0-indexed)
// in the database and values (1-indexed) to avoid problems with
// transmitting 0 in an HTML form
// required, value, expected
array(1, '0', 'FIELD_INVALID_VALUE', 'Required field should throw error for out-of-range value'),
array(1, '1', 'FIELD_REQUIRED', 'Required field should throw error for default value'),
array(1, '2', false, 'Required field should accept non-default value'),
array(0, '0', 'FIELD_INVALID_VALUE', 'Optional field should throw error for out-of-range value'),
array(0, '1', false, 'Optional field should accept default value'),
array(0, '2', false, 'Optional field should accept non-default value'),
array(1, '0', 'FIELD_INVALID_VALUE-field', 'Required field should throw error for out-of-range value'),
array(1, '1', 'FIELD_REQUIRED-field', 'Required field should throw error for default value'),
array(1, '2', false, 'Required field should accept non-default value'),
array(0, '0', 'FIELD_INVALID_VALUE-field', 'Optional field should throw error for out-of-range value'),
array(0, '1', false, 'Optional field should accept default value'),
array(0, '2', false, 'Optional field should accept non-default value'),
);
}
/**
* @dataProvider dropdownFields
* @dataProvider dropdown_fields
*/
public function test_dropdown_validate($field_required, $field_value, $expected, $description)
{
global $db;
global $db, $table_prefix;
$db = $this->new_dbal();
$field_data = array(
'field_id' => 1,
'lang_id' => 1,
'lang_name' => 'field',
'field_novalue' => 1,
'field_required' => $field_required,
);
$user = $this->getMock('\phpbb\user');
$user->expects($this->any())
->method('lang')
->will($this->returnCallback(array($this, 'return_callback_implode')));
$cp = new custom_profile;
$result = $cp->validate_profile_field(FIELD_DROPDOWN, $field_value, $field_data);
$request = $this->getMock('\phpbb\request\request');
$template = $this->getMock('\phpbb\template\template');
$cp = new \phpbb\profilefields\type\type_dropdown(
new \phpbb\profilefields\lang_helper($db, $table_prefix . 'profile_fields_lang'),
new \phpbb\profilefields\profilefields(
$this->getMock('\phpbb\auth\auth'),
$db,
$request,
$template,
$user,
$table_prefix . 'profile_fields',
$table_prefix . 'profile_lang',
$table_prefix . 'profile_fields_data'
),
$request,
$template,
$user
);
$result = $cp->validate_profile_field($field_value, $field_data);
$this->assertEquals($expected, $result, $description);
}
public function return_callback_implode()
{
return implode('-', func_get_args());
}
}

6
tests/profile/fixtures/profile_fields.xml
View File

@@ -10,21 +10,21 @@
<value>1</value>
<value>1</value>
<value>0</value>
<value>5</value>
<value>profilefields.type.dropdown</value>
<value>Default Option</value>
</row>
<row>
<value>1</value>
<value>1</value>
<value>1</value>
<value>5</value>
<value>profilefields.type.dropdown</value>
<value>First Alternative</value>
</row>
<row>
<value>1</value>
<value>1</value>
<value>2</value>
<value>5</value>
<value>profilefields.type.dropdown</value>
<value>Third Alternative</value>
</row>
</table>