diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-07-12 00:11:18 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-07-12 00:11:18 +0200 |
| commit | 382ae5a01ee9c1b694382f2e9a7cc14ffb6974ac (patch) | |
| tree | 348e54e75d7d54e3ad35972b02b6213b0ae55fdb | |
| parent | bf43da75f81761a277d68306e87c1c720d15d458 (diff) | |
| parent | a7edbf9258253dd694857af80273f6cddfe91274 (diff) | |
| download | forums-382ae5a01ee9c1b694382f2e9a7cc14ffb6974ac.tar forums-382ae5a01ee9c1b694382f2e9a7cc14ffb6974ac.tar.gz forums-382ae5a01ee9c1b694382f2e9a7cc14ffb6974ac.tar.bz2 forums-382ae5a01ee9c1b694382f2e9a7cc14ffb6974ac.tar.xz forums-382ae5a01ee9c1b694382f2e9a7cc14ffb6974ac.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11548] Use new static methods for request and submit
[ticket/11548] Run array_map on complete error array and not just colour_error
Conflicts:
tests/functional/ucp_groups_test.php
| -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 aada0525a8..8620e33e47 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -565,7 +565,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)) @@ -613,6 +613,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 f48c793ea1..1f9749ec15 100644 --- a/tests/functional/ucp_groups_test.php +++ b/tests/functional/ucp_groups_test.php @@ -50,4 +50,53 @@ class phpbb_functional_ucp_groups_test extends phpbb_functional_common_groups_te $this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text()); $this->assertEquals($teampage_settings, $this->get_teampage_settings()); } + + // 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()); + } } |