aboutsummaryrefslogtreecommitdiffstats
path: root/tests/functional
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-11-29 20:01:44 +0100
committerAndreas Fischer <bantu@phpbb.com>2012-11-29 20:01:44 +0100
commitaa9aa28fa25677b6b1c1dc60d7c345c4786a14e0 (patch)
tree6e5f2923611c93c5f2f2919e26a32af1fc3fbab2 /tests/functional
parentaaacfae428a354b76a7197452ed94aa77b128ea5 (diff)
parent7ec94208c4096b752e77503ef53382e126b7dab5 (diff)
downloadforums-aa9aa28fa25677b6b1c1dc60d7c345c4786a14e0.tar
forums-aa9aa28fa25677b6b1c1dc60d7c345c4786a14e0.tar.gz
forums-aa9aa28fa25677b6b1c1dc60d7c345c4786a14e0.tar.bz2
forums-aa9aa28fa25677b6b1c1dc60d7c345c4786a14e0.tar.xz
forums-aa9aa28fa25677b6b1c1dc60d7c345c4786a14e0.zip
Merge remote-tracking branch 'p/ticket/11202' into develop
* p/ticket/11202: [ticket/11202] Fix comment char, use more descriptive comment. [ticket/11202] Add response assertions to file upload functional test.
Diffstat (limited to 'tests/functional')
-rw-r--r--tests/functional/fileupload_form_test.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/functional/fileupload_form_test.php b/tests/functional/fileupload_form_test.php
index f7267fa659..99afcfdc3d 100644
--- a/tests/functional/fileupload_form_test.php
+++ b/tests/functional/fileupload_form_test.php
@@ -64,6 +64,9 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case
public function test_valid_file()
{
$crawler = $this->upload_file('valid.jpg', 'image/jpeg');
+ $this->assert_response_success();
+ // ensure there was no error message rendered
+ $this->assertNotContains('<h2>' . $this->lang('INFORMATION') . '</h2>', $this->client->getResponse()->getContent());
$this->assertContains($this->lang('POSTED_ATTACHMENTS'), $crawler->filter('#postform h3')->eq(1)->text());
}
}