diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-05 10:00:40 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-05 10:00:40 +0200 |
| commit | 1b16b8cd4263cb1abe4cf72c8c0e4ff5e869a685 (patch) | |
| tree | 514fdf540b13e738d9352d849eef434d0561301c /tests/upload | |
| parent | ced48a51a4a6ffca6a3fd2e3982b236bfa3a199c (diff) | |
| parent | fdfaba4607be827a63648c5103e84b96c8e85290 (diff) | |
| download | forums-1b16b8cd4263cb1abe4cf72c8c0e4ff5e869a685.tar forums-1b16b8cd4263cb1abe4cf72c8c0e4ff5e869a685.tar.gz forums-1b16b8cd4263cb1abe4cf72c8c0e4ff5e869a685.tar.bz2 forums-1b16b8cd4263cb1abe4cf72c8c0e4ff5e869a685.tar.xz forums-1b16b8cd4263cb1abe4cf72c8c0e4ff5e869a685.zip | |
Merge remote-tracking branch 'Marc/ticket/10851-ascraeus' into develop-ascraeus
* Marc/ticket/10851-ascraeus:
[ticket/10851] Request index instead of logging in and out in tests
[ticket/10851] Add unit and functional tests for checking attachments
[ticket/10851] Set disallowed content to empty array if checking is disabled
Diffstat (limited to 'tests/upload')
| -rw-r--r-- | tests/upload/filespec_test.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php index 87cd00197f..492f31cee6 100644 --- a/tests/upload/filespec_test.php +++ b/tests/upload/filespec_test.php @@ -143,6 +143,8 @@ class phpbb_filespec_test extends phpbb_test_case $disallowed_content = explode('|', $this->config['mime_triggers']); $filespec = $this->get_filespec(array('tmp_name' => $this->path . $filename)); $this->assertEquals($expected, $filespec->check_content($disallowed_content)); + // All files should pass if $disallowed_content is empty + $this->assertEquals(true, $filespec->check_content(array())); } public function clean_filename_variables() |