aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-07-12 14:38:18 -0400
committerMarc Alexander <admin@m-a-styles.de>2013-07-12 14:38:18 -0400
commit01b9f9f9b6f14d602ce57a37f0969707d1f0c41b (patch)
tree214a499b6f49791f452343963d5e1edf8b54ea9e
parentadff2fb254285e54f899f3a8604e1116cb11573c (diff)
downloadforums-01b9f9f9b6f14d602ce57a37f0969707d1f0c41b.tar
forums-01b9f9f9b6f14d602ce57a37f0969707d1f0c41b.tar.gz
forums-01b9f9f9b6f14d602ce57a37f0969707d1f0c41b.tar.bz2
forums-01b9f9f9b6f14d602ce57a37f0969707d1f0c41b.tar.xz
forums-01b9f9f9b6f14d602ce57a37f0969707d1f0c41b.zip
[ticket/11548] Fix test errors in groups test on develop
This will fix the errors that appeared in the functional groups test due to the changes in the new avatar system. The patch will make them work again. PHPBB3-11548
-rw-r--r--tests/functional/common_groups_test.php15
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/functional/common_groups_test.php b/tests/functional/common_groups_test.php
index f6b447dc90..6c6572af62 100644
--- a/tests/functional/common_groups_test.php
+++ b/tests/functional/common_groups_test.php
@@ -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());