diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-09-06 13:53:43 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-09-06 13:53:43 +0200 |
| commit | 6387bf8d1399b9ccf995b8eb5a4b93425d27e873 (patch) | |
| tree | eebf5374ee0f46ee5ddebc92f9847613ba87e27e /tests/functional/fileupload_form_test.php | |
| parent | 6eaeae60f6a2602cb44b1aa596af794629828313 (diff) | |
| parent | 21029e9fd295bedfcc34555d32afd928a03392a1 (diff) | |
| download | forums-6387bf8d1399b9ccf995b8eb5a4b93425d27e873.tar forums-6387bf8d1399b9ccf995b8eb5a4b93425d27e873.tar.gz forums-6387bf8d1399b9ccf995b8eb5a4b93425d27e873.tar.bz2 forums-6387bf8d1399b9ccf995b8eb5a4b93425d27e873.tar.xz forums-6387bf8d1399b9ccf995b8eb5a4b93425d27e873.zip | |
Merge pull request #2918 from marc1706/ticket/13031
[ticket/13031] Only use mimetype guesser guess if it helps us
* marc1706/ticket/13031:
[ticket/13031] Slightly change behavior of choose_mime_type and add unit tests
[ticket/13031] Guess with all mimetype guessers and pick best guess
[ticket/13031] Only use mimetype guesser guess if it helps us
Diffstat (limited to 'tests/functional/fileupload_form_test.php')
| -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 e87953367f..b8c48389e0 100644 --- a/tests/functional/fileupload_form_test.php +++ b/tests/functional/fileupload_form_test.php @@ -107,9 +107,9 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case $crawler = $this->upload_file('disallowed.jpg', 'image/jpeg'); - // Hitting the ATTACHED_IMAGE_NOT_IMAGE error means we passed the + // Hitting the UNABLE_GET_IMAGE_SIZE error means we passed the // DISALLOWED_CONTENT check - $this->assertContains($this->lang('ATTACHED_IMAGE_NOT_IMAGE'), $crawler->text()); + $this->assertContainsLang('UNABLE_GET_IMAGE_SIZE', $crawler->text()); } public function test_too_large() |