diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-08-06 22:53:15 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-08-06 22:53:15 +0200 |
| commit | 08a6bd2218e050ef2e82e644416a725b2a6cca99 (patch) | |
| tree | 7ca534bafbcd97feda75cd37a5cea0d9e0b75f69 | |
| parent | 3f86d503385734ee887f8a62c35834c13405ea0b (diff) | |
| parent | 2508439b02f5115e0557b2eee467e5ec5737d350 (diff) | |
| download | forums-08a6bd2218e050ef2e82e644416a725b2a6cca99.tar forums-08a6bd2218e050ef2e82e644416a725b2a6cca99.tar.gz forums-08a6bd2218e050ef2e82e644416a725b2a6cca99.tar.bz2 forums-08a6bd2218e050ef2e82e644416a725b2a6cca99.tar.xz forums-08a6bd2218e050ef2e82e644416a725b2a6cca99.zip | |
Merge remote-tracking branch 'asperous/ticket/11761' into develop
* asperous/ticket/11761:
[ticket/11761] Serve blank file locally in functional test
| -rw-r--r-- | phpBB/develop/blank.gif | 0 | ||||
| -rw-r--r-- | phpBB/develop/blank.jpg | 0 | ||||
| -rw-r--r-- | tests/functional/fileupload_remote_test.php | 6 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/develop/blank.gif b/phpBB/develop/blank.gif new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/phpBB/develop/blank.gif diff --git a/phpBB/develop/blank.jpg b/phpBB/develop/blank.jpg new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/phpBB/develop/blank.jpg diff --git a/tests/functional/fileupload_remote_test.php b/tests/functional/fileupload_remote_test.php index 8e361ab77b..65c4b6b7c4 100644 --- a/tests/functional/fileupload_remote_test.php +++ b/tests/functional/fileupload_remote_test.php @@ -44,14 +44,14 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case public function test_invalid_extension() { $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]); } - public function test_non_existant() + public function test_empty_file() { $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]); } |
