diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-08-07 12:06:33 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-08-07 12:06:33 +0200 |
| commit | b203b4afa18e7e4774bec525620ec2a390ac374f (patch) | |
| tree | ffaab499179ddddbf4f6debe766f0ccf764c596f /tests/functional | |
| parent | a8cb525f77059afe23629935150f8ef96e07d4f9 (diff) | |
| parent | ff56f0dcfe6355a9bd24c1e33dee15c60d01526b (diff) | |
| download | forums-b203b4afa18e7e4774bec525620ec2a390ac374f.tar forums-b203b4afa18e7e4774bec525620ec2a390ac374f.tar.gz forums-b203b4afa18e7e4774bec525620ec2a390ac374f.tar.bz2 forums-b203b4afa18e7e4774bec525620ec2a390ac374f.tar.xz forums-b203b4afa18e7e4774bec525620ec2a390ac374f.zip | |
Merge remote-tracking branch 'github-marc1706/ticket/11148' into develop-ascraeus
* github-marc1706/ticket/11148:
[ticket/11148] Remove unneeded variable mimetype and use type octet-stream
[ticket/11148] Change expected output with disallowed content in test
[ticket/11148] Always use the output of the mimetype guesser in get_mimetype
[ticket/11148] Get rid of extra line in mimetype guesser setter doc block
[ticket/11148] Add missing parts to docblock of get_mimetype() method
[ticket/11148] Default to application/octet-stream if no mimetype given
[ticket/11148] Use mimetype guesser for uploaded avatars
[ticket/11148] Pass mimetype guesser to upload_attachment() function
[ticket/11148] Add mimetype guesser to filespec and fileupload class
Diffstat (limited to 'tests/functional')
| -rw-r--r-- | tests/functional/fileupload_form_test.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/functional/fileupload_form_test.php b/tests/functional/fileupload_form_test.php index b9d55fbd3c..29036c821e 100644 --- a/tests/functional/fileupload_form_test.php +++ b/tests/functional/fileupload_form_test.php @@ -109,9 +109,9 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case $crawler = $this->upload_file('disallowed.jpg', 'image/jpeg'); - // Hitting the UNABLE_GET_IMAGE_SIZE error means we passed the + // Hitting the ATTACHED_IMAGE_NOT_IMAGE error means we passed the // DISALLOWED_CONTENT check - $this->assertEquals($this->lang('UNABLE_GET_IMAGE_SIZE'), $crawler->filter('p.error')->text()); + $this->assertContains($this->lang('ATTACHED_IMAGE_NOT_IMAGE'), $crawler->text()); } public function test_too_large() |