mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 14:30:32 +02:00
Code Issues Releases Wiki Activity

[ticket/13904] Fix tests again

Browse Source 
PHPBB3-13904
This commit is contained in:
Marc Alexander
2015-06-02 13:42:58 +02:00
parent 0121e60cd7
commit ef59e0228a
2 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/functional/fileupload_remote_test.php
View File

@@ -22,6 +22,9 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
/** @var \phpbb\files\factory */
protected $factory;
/** @var \phpbb\language\language */
protected $language;
public function setUp()
{
parent::setUp();
@@ -30,7 +33,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
// Global $config required by unique_id
// Global $user required by fileupload::remote_upload
global $config, $user;
global $config, $user, $phpbb_root_path, $phpEx;
if (!is_array($config))
{
@@ -48,6 +51,8 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
$container->set('files.filespec', new \phpbb\files\filespec($this->filesystem));
$this->factory = new \phpbb\files\factory($container);
$container->set('files.factory', $this->factory);
$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
}
public function tearDown()
@@ -60,7 +65,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
public function test_invalid_extension()
{
/** @var \phpbb\files\upload $upload */
$upload = new \phpbb\files\upload($this->filesystem, $this->factory);
$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
$upload->set_error_prefix('')
->set_allowed_extensions(array('jpg'))
->set_max_filesize(100);
@@ -71,7 +76,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
public function test_empty_file()
{
/** @var \phpbb\files\upload $upload */
$upload = new \phpbb\files\upload($this->filesystem, $this->factory);
$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
$upload->set_error_prefix('')
->set_allowed_extensions(array('jpg'))
->set_max_filesize(100);
@@ -82,7 +87,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
public function test_successful_upload()
{
/** @var \phpbb\files\upload $upload */
$upload = new \phpbb\files\upload($this->filesystem, $this->factory);
$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
$upload->set_error_prefix('')
->set_allowed_extensions(array('gif'))
->set_max_filesize(1000);
@@ -94,7 +99,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
public function test_too_large()
{
/** @var \phpbb\files\upload $upload */
$upload = new \phpbb\files\upload($this->filesystem, $this->factory);
$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
$upload->set_error_prefix('')
->set_allowed_extensions(array('gif'))
->set_max_filesize(100);