mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-21 16:01:40 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'remotes/Marc/ticket/11548-develop' into develop

Browse Source 
# By Marc Alexander
# Via Marc Alexander
* remotes/Marc/ticket/11548-develop:
  [ticket/11548] Fix test errors in groups test on develop
  [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
This commit is contained in:
Nathaniel Guse
2013-07-12 14:12:46 -05:00
parent 91672b6d56 01b9f9f9b6
commit 8a93a35def
2 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/functional/common_groups_test.php
View File

@@ -84,19 +84,19 @@ abstract class phpbb_functional_common_groups_test extends phpbb_functional_test
public function group_avatar_min_max_data()
{
return array(
array('uploadurl', 'foo', 'TOO_SHORT'),
array('uploadurl', 'foobar', 'AVATAR_URL_INVALID'),
array('uploadurl', str_repeat('f', 256), 'TOO_LONG'),
array('remotelink', 'foo', 'TOO_SHORT'),
array('remotelink', 'foobar', 'AVATAR_URL_INVALID'),
array('remotelink', str_repeat('f', 256), 'TOO_LONG'),
array('avatar_driver_upload', 'avatar_upload_url', 'foo', 'AVATAR_URL_INVALID'),
array('avatar_driver_upload', 'avatar_upload_url', 'foobar', 'AVATAR_URL_INVALID'),
array('avatar_driver_upload', 'avatar_upload_url', 'http://www.phpbb.com/' . str_repeat('f', 240) . '.png', 'TOO_LONG'),
array('avatar_driver_remote', 'avatar_remote_url', 'foo', 'AVATAR_URL_INVALID'),
array('avatar_driver_remote', 'avatar_remote_url', 'foobar', 'AVATAR_URL_INVALID'),
array('avatar_driver_remote', 'avatar_remote_url', 'http://www.phpbb.com/' . str_repeat('f', 240) . '.png', 'TOO_LONG'),
);
}
/**
* @dataProvider group_avatar_min_max_data
*/
public function test_group_avatar_min_max($form_name, $input, $expected)
public function test_group_avatar_min_max($avatar_type, $form_name, $input, $expected)
{
$this->login();
$this->admin_login();
@@ -105,6 +105,7 @@ abstract class phpbb_functional_common_groups_test extends phpbb_functional_test
$crawler = self::request('GET', $this->get_url() . '&g=5&sid=' . $this->sid);
$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
$form['avatar_driver']->setValue($avatar_type);
$form[$form_name]->setValue($input);
$crawler = self::submit($form);
$this->assertContains($this->lang($expected), $crawler->text());