diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-07-11 23:38:49 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-07-11 23:38:49 +0200 |
| commit | a7edbf9258253dd694857af80273f6cddfe91274 (patch) | |
| tree | 541bd9410d67aa26c3afc10f8548bfa6cc196b25 | |
| parent | 94e5bfaadad3be2bcda5347754c3f1b5be33c620 (diff) | |
| parent | 2667c3a527b3a2362370583446231391a4354565 (diff) | |
| download | forums-a7edbf9258253dd694857af80273f6cddfe91274.tar forums-a7edbf9258253dd694857af80273f6cddfe91274.tar.gz forums-a7edbf9258253dd694857af80273f6cddfe91274.tar.bz2 forums-a7edbf9258253dd694857af80273f6cddfe91274.tar.xz forums-a7edbf9258253dd694857af80273f6cddfe91274.zip | |
Merge remote-tracking branch 'marc1706/ticket/11548' into develop-olympus
* marc1706/ticket/11548:
[ticket/11548] Use new static methods for request and submit
[ticket/11548] Run array_map on complete error array and not just colour_error
| -rw-r--r-- | phpBB/includes/ucp/ucp_groups.php | 3 | ||||
| -rw-r--r-- | tests/functional/ucp_groups_test.php | 49 |
2 files changed, 51 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index 9365913541..663b5bc931 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -599,7 +599,7 @@ class ucp_groups if ($colour_error = validate_data($submit_ary, array('colour' => array('hex_colour', true)))) { // Replace "error" string with its real, localised form - $error = array_merge($error, array_map(array(&$user, 'lang'), $colour_error)); + $error = array_merge($error, $colour_error); } if (!sizeof($error)) @@ -642,6 +642,7 @@ class ucp_groups if (sizeof($error)) { + $error = array_map(array(&$user, 'lang'), $error); $group_rank = $submit_ary['rank']; $group_desc_data = array( diff --git a/tests/functional/ucp_groups_test.php b/tests/functional/ucp_groups_test.php index 9c6b1edc5e..0d9ef22798 100644 --- a/tests/functional/ucp_groups_test.php +++ b/tests/functional/ucp_groups_test.php @@ -18,4 +18,53 @@ class phpbb_functional_ucp_groups_test extends phpbb_functional_common_groups_te { return 'ucp.php?i=groups&mode=manage&action=edit'; } + + // Enable all avatars in the ACP + private function enable_all_avatars() + { + $this->add_lang('acp/board'); + + $crawler = self::request('GET', 'adm/index.php?i=board&mode=avatar&sid=' . $this->sid); + // Check the default entries we should have + $this->assertContains($this->lang('ALLOW_REMOTE'), $crawler->text()); + $this->assertContains($this->lang('ALLOW_AVATARS'), $crawler->text()); + $this->assertContains($this->lang('ALLOW_LOCAL'), $crawler->text()); + + // Now start setting the needed settings + $form = $crawler->selectButton($this->lang('SUBMIT'))->form(); + $form['config[allow_avatar_local]']->select(1); + $form['config[allow_avatar_remote]']->select(1); + $form['config[allow_avatar_remote_upload]']->select(1); + $crawler = self::submit($form); + $this->assertContains($this->lang('CONFIG_UPDATED'), $crawler->text()); + } + + 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'), + ); + } + + /** + * @dataProvider group_avatar_min_max_data + */ + public function test_group_avatar_min_max($form_name, $input, $expected) + { + $this->login(); + $this->admin_login(); + $this->add_lang(array('ucp', 'acp/groups')); + $this->enable_all_avatars(); + + $crawler = self::request('GET', $this->get_url() . '&g=5&sid=' . $this->sid); + $form = $crawler->selectButton($this->lang('SUBMIT'))->form(); + $form[$form_name]->setValue($input); + $crawler = self::submit($form); + $this->assertContains($this->lang($expected), $crawler->text()); + } } |