makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'asperous/ticket/11761' into develop

Browse source 
* asperous/ticket/11761:
  [ticket/11761] Serve blank file locally in functional test
This commit is contained in:
Andreas Fischer 2013-08-06 22:53:15 +02:00
commit 08a6bd2218
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
phpBB/develop/blank.gif Normal file
View file

0
phpBB/develop/blank.jpg Normal file
View file

6
tests/functional/fileupload_remote_test.php
View file

@ -44,14 +44,14 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
public function test_invalid_extension() public function test_invalid_extension()
{ {
$upload = new fileupload('', array('jpg'), 100); $upload = new fileupload('', array('jpg'), 100);
$file = $upload->remote_upload('http://example.com/image.gif'); $file = $upload->remote_upload(self::$root_url . 'develop/blank.gif');
$this->assertEquals('URL_INVALID', $file->error[0]); $this->assertEquals('URL_INVALID', $file->error[0]);
} }
public function test_non_existant() public function test_empty_file()
{ {
$upload = new fileupload('', array('jpg'), 100); $upload = new fileupload('', array('jpg'), 100);
$file = $upload->remote_upload('http://example.com/image.jpg'); $file = $upload->remote_upload(self::$root_url . 'develop/blank.jpg');
$this->assertEquals('EMPTY_REMOTE_DATA', $file->error[0]); $this->assertEquals('EMPTY_REMOTE_DATA', $file->error[0]);
} }