aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-07-22 00:50:49 +0200
committerAndreas Fischer <bantu@phpbb.com>2013-07-22 00:50:49 +0200
commit90e532430c94efa8bc5120bd81c9a5321c7deacb (patch)
tree4e076dc4a32a76bbb76b98a3e36dfe03ec6f6543 /tests
parent8d8a0602d6670764ccd01b2082b9d085f773f8e0 (diff)
parent148df3607b230dfd77aa426657ce27b6d24e396b (diff)
downloadforums-90e532430c94efa8bc5120bd81c9a5321c7deacb.tar
forums-90e532430c94efa8bc5120bd81c9a5321c7deacb.tar.gz
forums-90e532430c94efa8bc5120bd81c9a5321c7deacb.tar.bz2
forums-90e532430c94efa8bc5120bd81c9a5321c7deacb.tar.xz
forums-90e532430c94efa8bc5120bd81c9a5321c7deacb.zip
Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12: [ticket/11720] Add functional test for submitting report as user [ticket/11720] Do not call $captcha->validate if $captcha is not set
Diffstat (limited to 'tests')
-rw-r--r--tests/functional/report_post_captcha_test.php (renamed from tests/functional/report_post_captcha.php)19
1 files changed, 12 insertions, 7 deletions
diff --git a/tests/functional/report_post_captcha.php b/tests/functional/report_post_captcha_test.php
index af713775c5..8283465041 100644
--- a/tests/functional/report_post_captcha.php
+++ b/tests/functional/report_post_captcha_test.php
@@ -12,13 +12,6 @@
*/
class phpbb_functional_report_post_captcha_test extends phpbb_functional_test_case
{
- public function test_user_report_post()
- {
- $this->login();
- $crawler = self::request('GET', 'report.php?f=2&p=1');
- $this->assertNotContains($this->lang('CONFIRM_CODE'), $crawler->filter('html')->text());
- }
-
public function test_guest_report_post()
{
$crawler = self::request('GET', 'report.php?f=2&p=1');
@@ -31,6 +24,18 @@ class phpbb_functional_report_post_captcha_test extends phpbb_functional_test_ca
$this->set_reporting_guest(-1);
}
+ public function test_user_report_post()
+ {
+ $this->login();
+ $crawler = self::request('GET', 'report.php?f=2&p=1');
+ $this->assertNotContains($this->lang('CONFIRM_CODE'), $crawler->filter('html')->text());
+
+ $this->add_lang('mcp');
+ $form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+ $crawler = self::submit($form);
+ $this->assertContains($this->lang('POST_REPORTED_SUCCESS'), $crawler->text());
+ }
+
protected function set_reporting_guest($report_post_allowed)
{
$this->login();